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

Commit bf1f22d0 authored by Brian Julian's avatar Brian Julian Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into tm-dev

parents 3c232f03 ec3a20c2

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

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

package com.android.server.location;





import static android.Manifest.permission.ACCESS_FINE_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.Manifest.permission.WRITE_SECURE_SETTINGS;

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

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

import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;

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




    @Override

    @Override

    public void addProviderRequestListener(IProviderRequestListener listener) {

    public void addProviderRequestListener(IProviderRequestListener listener) {

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

            for (LocationProviderManager manager : mProviderManagers) {

            for (LocationProviderManager manager : mProviderManagers) {

                manager.addProviderRequestListener(listener);

                manager.addProviderRequestListener(listener);

            }

            }

        }

        }

    }





    @Override

    @Override

    public void removeProviderRequestListener(IProviderRequestListener listener) {

    public void removeProviderRequestListener(IProviderRequestListener listener) {