Fix NPE for the feature flag check

Bug: 237723969

Test: Tested via GTS

Change-Id: I40b0e4c2327cfead0cf3685329646f1d707c70fd
This commit is contained in:
Guojing Yuan
2022-07-14 19:42:16 +00:00
parent 0c97e28823
commit 06a345d2a0

View File

@@ -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;
}
}
}