Merge change 25938 into eclair

* changes:
  Don't require WAKE_LOCK permission to enable wifi

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());