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

Commit af1d032d authored by Brian Julian's avatar Brian Julian Committed by Automerger Merge Worker
Browse files

DO NOT MERGE. Add a permissions check to LocationManagerService. am:... 

DO NOT MERGE. Add a permissions check to LocationManagerService. am: ec3a20c2 am: 77da15a9 am: 6563dd42

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320595



Change-Id: I1c9e00259f9bc2dc2fd7a68d93dad03c1d5314f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c5ec9d7 6563dd42

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

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.location;



import static android.Manifest.permission.ACCESS_FINE_LOCATION;

import static android.Manifest.permission.INTERACT_ACROSS_USERS;

import static android.Manifest.permission.WRITE_SECURE_SETTINGS;

import static android.app.compat.CompatChanges.isChangeEnabled;

import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
@@ -1030,10 +1031,12 @@ public class LocationManagerService extends ILocationManager.Stub implements 


    @Override

    public void addProviderRequestListener(IProviderRequestListener listener) {

        if (mContext.checkCallingOrSelfPermission(INTERACT_ACROSS_USERS) == PERMISSION_GRANTED) {

            for (LocationProviderManager manager : mProviderManagers) {

                manager.addProviderRequestListener(listener);

            }

        }

    }



    @Override

    public void removeProviderRequestListener(IProviderRequestListener listener) {