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

Commit b4dbfff3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
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"
parents d2ee60f3 d3dd0119

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;

        }