Merge "Fix NPE for the feature flag check" into tm-qpr-dev

2022-07-18 21:47:47 +00:00
parent eec7bcb14a 06a345d2a0
commit 7a87c1e03d
1 changed files with 5 additions and 3 deletions
--- a/services/companion/java/com/android/server/companion/PackageUtils.java
+++ b/services/companion/java/com/android/server/companion/PackageUtils.java
@@ -67,9 +67,11 @@ final class PackageUtils {
        String requiredFeature = FEATURE_COMPANION_DEVICE_SETUP;

        FeatureInfo[] requestedFeatures = getPackageInfo(context, userId, packageName).reqFeatures;
-        for (int i = 0; i < requestedFeatures.length; i++) {
-            if (requiredFeature.equals(requestedFeatures[i].name)) {
-                return;
+        if (requestedFeatures != null) {
+            for (int i = 0; i < requestedFeatures.length; i++) {
+                if (requiredFeature.equals(requestedFeatures[i].name)) {
+                    return;
+                }
            }
        }