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

Merge changes from topic "phone-call-indicators" into rvc-qpr-dev am: ff2866cfd6

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

Change-Id: I70fe25b463fffcf011876bd55d9925ee0bb07949
This commit is contained in:
Philip P. Moltmann
2020-08-20 19:50:41 +00:00
committed by Automerger Merge Worker
parent 541749bf7e ff2866cfd6
commit a592f49c5b
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
View File

@@ -68,6 +68,12 @@ public class AppOpsControllerImpl implements AppOpsController,
private final AppOpsManager mAppOps; private final AppOpsManager mAppOps;
private final AudioManager mAudioManager; private final AudioManager mAudioManager;
private final LocationManager mLocationManager; private final LocationManager mLocationManager;
// mLocationProviderPackages are cached and updated only occasionally
private static final long LOCATION_PROVIDER_UPDATE_FREQUENCY_MS = 30000;
private long mLastLocationProviderPackageUpdate;
private List<String> mLocationProviderPackages;
private H mBGHandler; private H mBGHandler;
private final List<AppOpsController.Callback> mCallbacks = new ArrayList<>(); private final List<AppOpsController.Callback> mCallbacks = new ArrayList<>();
private final ArrayMap<Integer, Set<Callback>> mCallbacksByCode = new ArrayMap<>(); private final ArrayMap<Integer, Set<Callback>> mCallbacksByCode = new ArrayMap<>();
@@ -292,6 +298,26 @@ public class AppOpsControllerImpl implements AppOpsController,
return isUserVisible(item.getCode(), item.getUid(), item.getPackageName()); return isUserVisible(item.getCode(), item.getUid(), item.getPackageName());
} }
/**
* Checks if a package is the current location provider.
*
* <p>Data is cached to avoid too many calls into system server
*
* @param packageName The package that might be the location provider
*
* @return {@code true} iff the package is the location provider.
*/
private boolean isLocationProvider(String packageName) {
long now = System.currentTimeMillis();
if (mLastLocationProviderPackageUpdate + LOCATION_PROVIDER_UPDATE_FREQUENCY_MS < now) {
mLastLocationProviderPackageUpdate = now;
mLocationProviderPackages = mLocationManager.getProviderPackages(
LocationManager.FUSED_PROVIDER);
}
return mLocationProviderPackages.contains(packageName);
}
/** /**
* Does the app-op, uid and package name, refer to an operation that should be shown to the * Does the app-op, uid and package name, refer to an operation that should be shown to the
@@ -313,8 +339,7 @@ public class AppOpsControllerImpl implements AppOpsController,
return true; return true;
} }
if (appOpCode == AppOpsManager.OP_CAMERA && mLocationManager.isProviderPackage( if (appOpCode == AppOpsManager.OP_CAMERA && isLocationProvider(packageName)) {
packageName)) {
return true; return true;
} }