From 29c1c42e18a72a3c5760a9fb741031877293d5aa Mon Sep 17 00:00:00 2001
From: Amith Yamasani <>
Date: Thu, 2 Apr 2009 11:39:09 -0700
Subject: [PATCH] AI 144256: Need to show opt-in screen for location
 collection.   Added a screen to the setup wizard, after login, to ask user to
   opt-in for location collection.   Added a dialog to Settings when user
 turns on Network location.   Fixed a security permission issue in
 LocationManagerService related   to this change.   BUG=1752566

Automated import of CL 144256
---
 services/java/com/android/server/LocationManagerService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 5abf249ca09de..705ddb3b7acd2 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -2074,6 +2074,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;
 
@@ -2117,6 +2119,7 @@ public class LocationManagerService extends ILocationManager.Stub
             mLocationHandler.removeMessages(MESSAGE_RELEASE_WAKE_LOCK);
             releaseWakeLockLocked();
         }
+        Binder.restoreCallingIdentity(callerId);
     }
 
     private void acquireWakeLockLocked() {