Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Icc706f0beb3f35ab858e030c9aeae137cb9d9049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brian Julian
2022-05-20 19:34:07 +00:00
committed by Automerger Merge Worker
parent 81fcf4a250 ec3a20c2b2
commit 05bdb86fe7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/location/LocationManagerService.java
View File

@@ -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) {