From 06a345d2a0fad0fe75104e352afc59d272183440 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Thu, 14 Jul 2022 19:42:16 +0000
Subject: [PATCH] Fix NPE for the feature flag check

Bug: 237723969

Test: Tested via GTS

Change-Id: I40b0e4c2327cfead0cf3685329646f1d707c70fd
---
 .../java/com/android/server/companion/PackageUtils.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/companion/java/com/android/server/companion/PackageUtils.java b/services/companion/java/com/android/server/companion/PackageUtils.java
index 6b235879486c6..f523773033d17 100644
--- 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;
+                }
             }
         }