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

Commit a74b5a79 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 833b05e7 7a0602e3

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1222,6 +1222,7 @@ public final class BluetoothAdapter { 
            if (mService != null) {

            if (mService != null) {

                return mService.factoryReset();

                return mService.factoryReset();

            }

            }

            Log.e(TAG, "factoryReset(): IBluetooth Service is null");

            SystemProperties.set("persist.bluetooth.factoryreset", "true");

            SystemProperties.set("persist.bluetooth.factoryreset", "true");

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            Log.e(TAG, "", e);
@@ -1239,7 +1240,7 @@ public final class BluetoothAdapter { 
     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public @NonNull ParcelUuid[] getUuids() {

    public @Nullable ParcelUuid[] getUuids() {

        if (getState() != STATE_ON) {

        if (getState() != STATE_ON) {

            return null;

            return null;

        }

        }