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

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

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
parent 28d139fa

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -2059,6 +2059,8 @@ public class LocationManagerService extends ILocationManager.Stub 
    private void updateWakelockStatusLocked(boolean screenOn) {

    private void updateWakelockStatusLocked(boolean screenOn) {

        log("updateWakelockStatus(): " + screenOn);

        log("updateWakelockStatus(): " + screenOn);





        long callerId = Binder.clearCallingIdentity();

        

        boolean needsLock = false;

        boolean needsLock = false;

        long minTime = Integer.MAX_VALUE;

        long minTime = Integer.MAX_VALUE;
@@ -2102,6 +2104,7 @@ public class LocationManagerService extends ILocationManager.Stub 
            mLocationHandler.removeMessages(MESSAGE_RELEASE_WAKE_LOCK);

            mLocationHandler.removeMessages(MESSAGE_RELEASE_WAKE_LOCK);

            releaseWakeLockLocked();

            releaseWakeLockLocked();

        }

        }

        Binder.restoreCallingIdentity(callerId);

    }

    }





    private void acquireWakeLockLocked() {

    private void acquireWakeLockLocked() {