commit 3e276b18b4c502b9a169442525b76c56588f2436
author Amith Yamasani Thu Apr 02 22:49:19 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 02 22:49:19 2009 -0700
tree 99b3a6d9214b0bc24a74cfc6db6bdff740091161
parent 28d139fa953c0b3bf2c66d92587e5287ec4dd5ab

AI 144395: am: CL 144257 am: CL 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.
  Original author: yamasani
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144395

services/java/com/android/server/LocationManagerService.java

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 630c84b..edee5f8 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -2059,6 +2059,8 @@
     private void updateWakelockStatusLocked(boolean screenOn) {
         log("updateWakelockStatus(): " + screenOn);
 
+        long callerId = Binder.clearCallingIdentity();
+        
         boolean needsLock = false;
         long minTime = Integer.MAX_VALUE;
 
@@ -2102,6 +2104,7 @@
             mLocationHandler.removeMessages(MESSAGE_RELEASE_WAKE_LOCK);
             releaseWakeLockLocked();
         }
+        Binder.restoreCallingIdentity(callerId);
     }
 
     private void acquireWakeLockLocked() {