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

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

Browse Source
This commit is contained in:
Brian Julian
2022-05-20 19:27:25 +00:00
committed by Android (Google) Code Review
parent 59378118d7 5b376bc9fd
commit 3fe61746df
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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.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;
import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY; import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
@@ -39,6 +40,7 @@ import android.Manifest;
import android.Manifest.permission; import android.Manifest.permission;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.PendingIntent; import android.app.PendingIntent;
@@ -1063,10 +1065,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) {