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

Merge "Use finally block for Binder.restoreCallingIdentity"

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-03 20:05:50 +00:00
committed by Gerrit Code Review
parent 6f61cdcc1d 013cb91a69
commit d6eba76780
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -601,9 +601,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} }
// waive WRITE_SECURE_SETTINGS permission check // waive WRITE_SECURE_SETTINGS permission check
long callingIdentity = Binder.clearCallingIdentity(); 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); Binder.restoreCallingIdentity(callingIdentity);
} }
}
/** /**
* Returns true if the Bluetooth Adapter's name and address is * Returns true if the Bluetooth Adapter's name and address is