diff --git a/core/java/android/permission/PermissionUsageHelper.java b/core/java/android/permission/PermissionUsageHelper.java
index 6a8dca1535854..7243234227b4d 100644
--- a/core/java/android/permission/PermissionUsageHelper.java
+++ b/core/java/android/permission/PermissionUsageHelper.java
@@ -153,11 +153,13 @@ public class PermissionUsageHelper {
      * @see PermissionManager.getIndicatorAppOpUsageData
      */
     public List<PermGroupUsage> getOpUsageData(boolean isMicMuted) {
+        List<PermGroupUsage> usages = new ArrayList<>();
+
         if (!shouldShowIndicators()) {
-            return null;
+            return usages;
         }
 
-        List<String> ops = CAMERA_OPS;
+        List<String> ops = new ArrayList<>(CAMERA_OPS);
         if (shouldShowLocationIndicator()) {
             ops.addAll(LOCATION_OPS);
         }
@@ -169,7 +171,6 @@ public class PermissionUsageHelper {
         Map<PackageAttribution, CharSequence> packagesWithAttributionLabels =
                 getTrustedAttributions(rawUsages.get(MICROPHONE));
 
-        List<PermGroupUsage> usages = new ArrayList<>();
         List<String> usedPermGroups = new ArrayList<>(rawUsages.keySet());
         for (int permGroupNum = 0; permGroupNum < usedPermGroups.size(); permGroupNum++) {
             boolean isPhone = false;