diff options
| -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;          }  |