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

Make sure user context map is ArrayMap, not Map

Browse Source 
Ensure the user context map is editable, and remove hardcoded enable.

Fixes: 178616169
Test: manual
Change-Id: I54d721be7712a2efcc3695bae5ae7e44920a40ed
This commit is contained in:
Nate Myren
2021-01-27 11:44:21 -08:00
parent 3f08df9fe9
commit a2cd99a805
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/permission/PermissionUsageHelper.java
View File

@@ -88,10 +88,8 @@ public class PermissionUsageHelper {
private static final long DEFAULT_RECENT_TIME_MS = 30000L;
private static boolean shouldShowIndicators() {
return true;
// TODO ntmyren: remove true set when device config is configured correctly
//DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
//PROPERTY_CAMERA_MIC_ICONS_ENABLED, true);
return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
PROPERTY_CAMERA_MIC_ICONS_ENABLED, true);
}
private static boolean shouldShowLocationIndicator() {
@@ -142,7 +140,7 @@ public class PermissionUsageHelper {
}
private Context mContext;
private Map<UserHandle, Context> mUserContexts;
private ArrayMap<UserHandle, Context> mUserContexts;
private PackageManager mPkgManager;
private AppOpsManager mAppOpsManager;
@@ -154,7 +152,8 @@ public class PermissionUsageHelper {
mContext = context;
mPkgManager = context.getPackageManager();
mAppOpsManager = context.getSystemService(AppOpsManager.class);
mUserContexts = Map.of(Process.myUserHandle(), mContext);
mUserContexts = new ArrayMap<>();
mUserContexts.put(Process.myUserHandle(), mContext);
}
private Context getUserContext(UserHandle user) {