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

Commit d3dd0119 authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

Add error log to BluetoothAdapter.factoryReset() and make 

BluetoothAdapter.getUuids() marked with @Nullable

Bug: 144765076
Test: Manual
Change-Id: I2a38fbb2256177ad29e2739ccbec8c13aae9df6a
parent ec3e77e1

core/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;

        }