Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I7609ae29664360736ca386950e93437c1a6578e7
This commit is contained in:
TreeHugger Robot
2021-06-02 18:58:57 +00:00
committed by Automerger Merge Worker
parent 6f32fefe3e 4e0e1437d8
commit 09131ceb93
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -614,8 +614,12 @@ 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);
Binder.restoreCallingIdentity(callingIdentity);
try {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.BLUETOOTH_ON, value);
} finally {
Binder.restoreCallingIdentity(callingIdentity);
}
}
/**