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

Commit 09131ceb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use finally block for Binder.restoreCallingIdentity" into... 

Merge "Use finally block for Binder.restoreCallingIdentity" into sc-dev-plus-aosp am: 941fd175 am: 4e0e1437

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14796817

Change-Id: I7609ae29664360736ca386950e93437c1a6578e7
parents 6f32fefe 4e0e1437

services/core/java/com/android/server/BluetoothManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -614,9 +614,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        }

        // waive WRITE_SECURE_SETTINGS permission check

        final long callingIdentity = Binder.clearCallingIdentity();

        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLUETOOTH_ON, value);

        try {

            Settings.Global.putInt(mContext.getContentResolver(),

                    Settings.Global.BLUETOOTH_ON, value);

        } finally {

            Binder.restoreCallingIdentity(callingIdentity);

        }

    }



    /**

     * Returns true if the Bluetooth Adapter's name and address is