drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock

Browse Source 
WifiService needs to keep the calling identity cleared while
it is doing all of its internal work.

Change-Id: I2bd720e26efcf5ad5839693307d61e51f0658ace
This commit is contained in:
Dianne Hackborn
2010-10-08 14:23:40 -07:00
parent 9934fa77ef
commit ecfd7f7d95
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2163,12 +2163,12 @@ public class WifiService extends IWifiManager.Stub {
if (DBG) throw new IllegalArgumentException("lockMode=" + lockMode);
return false;
}
if (ws != null) {
enforceWakeSourcePermission(Binder.getCallingUid(), Binder.getCallingPid());
}
if (ws != null && ws.size() == 0) {
ws = null;
}
if (ws != null) {
enforceWakeSourcePermission(Binder.getCallingUid(), Binder.getCallingPid());
}
if (ws == null) {
ws = new WorkSource(Binder.getCallingUid());
}
@ -2227,17 +2227,18 @@ public class WifiService extends IWifiManager.Stub {
++mScanLocksAcquired;
break;
}
// Be aggressive about adding new locks into the accounted state...
// we want to over-report rather than under-report.
reportStartWorkSource();
updateWifiState();
return true;
} catch (RemoteException e) {
return false;
} finally {
Binder.restoreCallingIdentity(ident);
}
// Be aggressive about adding new locks into the accounted state...
// we want to over-report rather than under-report.
reportStartWorkSource();
updateWifiState();
return true;
}
public void updateWifiLockWorkSource(IBinder lock, WorkSource ws) {
@ -2283,9 +2284,9 @@ public class WifiService extends IWifiManager.Stub {
hadLock = (wifiLock != null);
if (hadLock) {
long ident = Binder.clearCallingIdentity();
try {
long ident = Binder.clearCallingIdentity();
try {
if (hadLock) {
noteAcquireWifiLock(wifiLock);
switch(wifiLock.mMode) {
case WifiManager.WIFI_MODE_FULL:
@ -2298,13 +2299,16 @@ public class WifiService extends IWifiManager.Stub {
++mScanLocksReleased;
break;
}
} catch (RemoteException e) {
} finally {
Binder.restoreCallingIdentity(ident);
}
// TODO - should this only happen if you hadLock?
updateWifiState();
} catch (RemoteException e) {
} finally {
Binder.restoreCallingIdentity(ident);
}
// TODO - should this only happen if you hadLock?
updateWifiState();
return hadLock;
}