From a2cd99a805d590a2d72eefb7203a57d307ff4004 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Wed, 27 Jan 2021 11:44:21 -0800 Subject: [PATCH] Make sure user context map is ArrayMap, not Map Ensure the user context map is editable, and remove hardcoded enable. Fixes: 178616169 Test: manual Change-Id: I54d721be7712a2efcc3695bae5ae7e44920a40ed --- .../android/permission/PermissionUsageHelper.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/java/android/permission/PermissionUsageHelper.java b/core/java/android/permission/PermissionUsageHelper.java index db55e1c7afda0..b1b29254783c4 100644 --- a/core/java/android/permission/PermissionUsageHelper.java +++ b/core/java/android/permission/PermissionUsageHelper.java @@ -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 mUserContexts; + private ArrayMap 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) {