diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-01-22 21:09:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-22 21:09:39 +0000 |
| commit | b4dbfff3664bf99b048ab5fadbc12b200227ee76 (patch) | |
| tree | e95c42bef2851e374e4fbbd0f949bde3b12b7d33 /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | d2ee60f3781a191747832d031b54a00ab438c520 (diff) | |
| parent | d3dd01190cc668b045fd5843deb29801ad7a733a (diff) | |
Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable"
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 1869c6fa7621..bd0a39c06b26 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -1222,6 +1222,7 @@ public final class BluetoothAdapter { if (mService != null) { return mService.factoryReset(); } + Log.e(TAG, "factoryReset(): IBluetooth Service is null"); SystemProperties.set("persist.bluetooth.factoryreset", "true"); } catch (RemoteException e) { Log.e(TAG, "", e); @@ -1239,7 +1240,7 @@ public final class BluetoothAdapter { */ @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH) - public @NonNull ParcelUuid[] getUuids() { + public @Nullable ParcelUuid[] getUuids() { if (getState() != STATE_ON) { return null; } |