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

Merge "Use finally block for Binder.restoreCallingIdentity" am: d6eba76780

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

Change-Id: I9fb2471c55167155e0f91644c22400329e69a5f6
This commit is contained in:
Treehugger Robot
2021-06-03 20:08:50 +00:00
committed by Automerger Merge Worker
parent de7a581ed8 d6eba76780
commit b0f4798dcb
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

@@ -601,8 +601,12 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
}
// waive WRITE_SECURE_SETTINGS permission check
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);
}
}
/**