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

Merge "Restrict appops when location is off" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 15:58:06 +00:00
committed by Android (Google) Code Review
parent 9c4f884ed0 8b56ce99da
commit b0bcca6c78
1 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,6 +269,13 @@ public class LocationManagerService extends ILocationManager.Stub {
mInjector.getSettingsHelper().addOnLocationEnabledChangedListener(
this::onLocationModeChanged);
mInjector.getSettingsHelper().addOnIgnoreSettingsPackageWhitelistChangedListener(
() -> refreshAppOpsRestrictions(UserHandle.USER_ALL));
mInjector.getUserInfoHelper().addListener((userId, change) -> {
if (change == UserInfoHelper.UserListener.USER_STARTED) {
refreshAppOpsRestrictions(userId);
}
});
// set up passive provider first since it will be required for all other location providers,
// which are loaded later once the system is ready.
@@ -482,6 +489,8 @@ public class LocationManagerService extends ILocationManager.Stub {
.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY)
.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
mContext.sendBroadcastAsUser(intent, UserHandle.of(userId));
refreshAppOpsRestrictions(userId);
}
@Override
@@ -1347,6 +1356,43 @@ public class LocationManagerService extends ILocationManager.Stub {
ipw.decreaseIndent();
}
private void refreshAppOpsRestrictions(int userId) {
if (userId == UserHandle.USER_ALL) {
final int[] runningUserIds = mInjector.getUserInfoHelper().getRunningUserIds();
for (int i = 0; i < runningUserIds.length; i++) {
refreshAppOpsRestrictions(runningUserIds[i]);
}
return;
}
Preconditions.checkArgument(userId >= 0);
ArraySet<String> packages = new ArraySet<>();
for (LocationProviderManager manager : mProviderManagers) {
packages.add(manager.getIdentity().getPackageName());
}
packages.add(mContext.getPackageName());
packages.addAll(mInjector.getSettingsHelper().getIgnoreSettingsPackageWhitelist());
String[] allowedPackages = packages.toArray(new String[0]);
boolean enabled = mInjector.getSettingsHelper().isLocationEnabled(userId);
AppOpsManager appOpsManager = Objects.requireNonNull(
mContext.getSystemService(AppOpsManager.class));
appOpsManager.setUserRestrictionForUser(
AppOpsManager.OP_COARSE_LOCATION,
enabled,
LocationManagerService.this,
allowedPackages,
userId);
appOpsManager.setUserRestrictionForUser(
AppOpsManager.OP_FINE_LOCATION,
enabled,
LocationManagerService.this,
allowedPackages,
userId);
}
private class LocalService extends LocationManagerInternal {
LocalService() {}