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

am 4492bcd8: Merge change 25938 into eclair

Browse Source 
Merge commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30' into eclair-plus-aosp

* commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30':
  Don't require WAKE_LOCK permission to enable wifi
This commit is contained in:
Robert Greenwalt
2009-09-20 07:54:33 -07:00
committed by Android Git Automerger
parent a69e9d6050 4492bcd8b0
commit f60be7bf62
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,7 +295,11 @@ public class WifiService extends IWifiManager.Stub {
if (mWifiHandler == null) return false; if (mWifiHandler == null) return false;
synchronized (mWifiHandler) { synchronized (mWifiHandler) {
// caller may not have WAKE_LOCK permission - it's not required here
long ident = Binder.clearCallingIdentity();
sWakeLock.acquire(); sWakeLock.acquire();
Binder.restoreCallingIdentity(ident);
mLastEnableUid = Binder.getCallingUid(); mLastEnableUid = Binder.getCallingUid();
// set a flag if the user is enabling Wifi while in airplane mode // set a flag if the user is enabling Wifi while in airplane mode
mAirplaneModeOverwridden = (enable && isAirplaneModeOn() && isAirplaneToggleable()); mAirplaneModeOverwridden = (enable && isAirplaneModeOn() && isAirplaneToggleable());