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

am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread

Browse Source 
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'

* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
This commit is contained in:
Dianne Hackborn
2010-10-10 19:11:51 -07:00
committed by Android Git Automerger
parent fae998c860 c58e9bff10
commit 65bdf4e634
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

@@ -1148,12 +1148,12 @@ public class WifiService extends IWifiManager.Stub {
if (lockMode != WifiManager.WIFI_MODE_FULL && lockMode != WifiManager.WIFI_MODE_SCAN_ONLY) {
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());
}
@@ -1201,17 +1201,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) {
@@ -1257,9 +1258,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:
@@ -1269,13 +1270,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;
}