diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-20 10:48:09 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-20 10:48:09 -0400 |
| commit | 4492bcd8b0437b1200e93c001ca75d9fa8c4ad30 (patch) | |
| tree | d41df1de6fb8dd27c7b742be49288f20674ff90c /services/java | |
| parent | b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6 (diff) | |
| parent | a99f461b98df6b88c6b0fae83b41077dde9a2228 (diff) | |
| download | frameworks_base-4492bcd8b0437b1200e93c001ca75d9fa8c4ad30.zip frameworks_base-4492bcd8b0437b1200e93c001ca75d9fa8c4ad30.tar.gz frameworks_base-4492bcd8b0437b1200e93c001ca75d9fa8c4ad30.tar.bz2 | |
Merge change 25938 into eclair
* changes:
Don't require WAKE_LOCK permission to enable wifi
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 63bef54..cc1b697 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -295,7 +295,11 @@ public class WifiService extends IWifiManager.Stub { if (mWifiHandler == null) return false; synchronized (mWifiHandler) { + // caller may not have WAKE_LOCK permission - it's not required here + long ident = Binder.clearCallingIdentity(); sWakeLock.acquire(); + Binder.restoreCallingIdentity(ident); + mLastEnableUid = Binder.getCallingUid(); // set a flag if the user is enabling Wifi while in airplane mode mAirplaneModeOverwridden = (enable && isAirplaneModeOn() && isAirplaneToggleable()); |