Merge "All apps have 'null' feature" into rvc-dev am: b7050a36af

Change-Id: If95543302b63643d78b2460cf70851db47774e2b
2020-03-02 19:44:52 +00:00
parent 0f8aa5ec82 b7050a36af
commit 5df44b1a4e
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -1445,6 +1445,7 @@ public class AppOpsService extends IAppOpsService.Stub {

                ArrayMap<String, String> dstFeatureIds = new ArrayMap<>();
                ArraySet<String> featureIds = new ArraySet<>();
+                featureIds.add(null);
                if (pkg.getFeatures() != null) {
                    int numFeatures = pkg.getFeatures().size();
                    for (int featureNum = 0; featureNum < numFeatures; featureNum++) {