Merge branch 'readonly-p4-master'

2009-04-02 22:50:23 -07:00
parent 494204d66b 3e276b18b4
commit 9bb6ef5ad3
1 changed files with 3 additions and 0 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -2059,6 +2059,8 @@ public class LocationManagerService extends ILocationManager.Stub
    private void updateWakelockStatusLocked(boolean screenOn) {
        log("updateWakelockStatus(): " + screenOn);

+        long callerId = Binder.clearCallingIdentity();
+        
        boolean needsLock = false;
        long minTime = Integer.MAX_VALUE;

@@ -2102,6 +2104,7 @@ public class LocationManagerService extends ILocationManager.Stub
            mLocationHandler.removeMessages(MESSAGE_RELEASE_WAKE_LOCK);
            releaseWakeLockLocked();
        }
+        Binder.restoreCallingIdentity(callerId);
    }

    private void acquireWakeLockLocked() {