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

Merge "Make sure user context map is ArrayMap, not Map" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-27 23:27:16 +00:00
committed by Android (Google) Code Review
parent 9ce7fe2152 a2cd99a805
commit a33bbd1f62
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) {