Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dc95109 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by android-build-merger
Browse files

Merge "Add error log to BluetoothAdapter.factoryReset() and make... 

Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable"
am: a74b5a79

Change-Id: If06bce0f62fee4121c0e4445178c13458cd4b7c6
parents ccb28d7d a74b5a79

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

        }