Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Guojing Yuan
2022-07-18 21:47:47 +00:00
committed by Android (Google) Code Review
parent eec7bcb14a 06a345d2a0
commit 7a87c1e03d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/companion/java/com/android/server/companion/PackageUtils.java
View File

@@ -67,11 +67,13 @@ final class PackageUtils {
String requiredFeature = FEATURE_COMPANION_DEVICE_SETUP; String requiredFeature = FEATURE_COMPANION_DEVICE_SETUP;
FeatureInfo[] requestedFeatures = getPackageInfo(context, userId, packageName).reqFeatures; FeatureInfo[] requestedFeatures = getPackageInfo(context, userId, packageName).reqFeatures;
if (requestedFeatures != null) {
for (int i = 0; i < requestedFeatures.length; i++) { for (int i = 0; i < requestedFeatures.length; i++) {
if (requiredFeature.equals(requestedFeatures[i].name)) { if (requiredFeature.equals(requestedFeatures[i].name)) {
return; return;
} }
} }
}
throw new IllegalStateException("Must declare uses-feature " throw new IllegalStateException("Must declare uses-feature "
+ requiredFeature + requiredFeature