AI 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/... Automated import of CL 144257
This commit is contained in:
committed by
The Android Open Source Project
parent
d30b2568cd
commit
e1ccba2113
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user