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

am 89c82814: Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev

Browse Source 
* commit '89c82814dbdfd807b1611a8379be0421cd2f512d':
  Add restoreCallingIdentity under finally
This commit is contained in:
Irfan Sheriff
2012-09-16 18:56:03 -07:00
committed by Android Git Automerger
parent 86fa49265e 89c82814db
commit 1fa0aa291b
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/java/com/android/server/WifiService.java
View File

@@ -640,8 +640,11 @@ public class WifiService extends IWifiManager.Stub {
*/
long ident = Binder.clearCallingIdentity();
handleWifiToggled(enable);
Binder.restoreCallingIdentity(ident);
try {
handleWifiToggled(enable);
} finally {
Binder.restoreCallingIdentity(ident);
}
if (enable) {
if (!mIsReceiverRegistered) {
@@ -838,12 +841,15 @@ public class WifiService extends IWifiManager.Stub {
enforceAccessPermission();
int userId = UserHandle.getCallingUserId();
long ident = Binder.clearCallingIdentity();
int currentUser = ActivityManager.getCurrentUser();
Binder.restoreCallingIdentity(ident);
if (userId != currentUser) {
return new ArrayList<ScanResult>();
} else {
return mWifiStateMachine.syncGetScanResultsList();
try {
int currentUser = ActivityManager.getCurrentUser();
if (userId != currentUser) {
return new ArrayList<ScanResult>();
} else {
return mWifiStateMachine.syncGetScanResultsList();
}
} finally {
Binder.restoreCallingIdentity(ident);
}
}