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 am: 7a87c1e03d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19293731

Change-Id: Idd53f5feba124b03d7197a6daad15aef52909ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Guojing Yuan
2022-07-18 22:06:10 +00:00
committed by Automerger Merge Worker
parent 724113a7b7 7a87c1e03d
commit 9d1e3904fb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/companion/java/com/android/server/companion/PackageUtils.java
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;
}
}
}