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

Use finally block for Binder.restoreCallingIdentity

Browse Source 
1. Use final for Binder.clearCallingIdentity() to protect not being overwritten.
2. Protect it in the finally block of the try statement to avoid missing restore the CallingIdentity as exception.

Bug: 189819183
Test: Manual test
Ignore-AOSP-First: prevent merge conflict
Change-Id: I2dd4cfc1aacecb0b77fa4c82b48b24b284271779
This commit is contained in:
Alice Kuo
2021-06-02 10:34:56 +08:00
parent 30c467c60e
commit 5ffaea9494
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);
}
}
/**