Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29c1c42e authored by Amith Yamasani's avatar Amith Yamasani Committed by The Android Open Source Project
Browse files

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
parent 196677cf

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

+3 −0
Original line number Diff line number Diff line
@@ -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() {