Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d1e3904 authored by Guojing Yuan's avatar Guojing Yuan Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE for the feature flag check" into tm-qpr-dev am: 7a87c1e0 

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



Change-Id: Idd53f5feba124b03d7197a6daad15aef52909ea8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 724113a7 7a87c1e0

services/companion/java/com/android/server/companion/PackageUtils.java

+5 −3
Original line number Diff line number Diff line
@@ -67,11 +67,13 @@ final class PackageUtils { 
        String requiredFeature = FEATURE_COMPANION_DEVICE_SETUP;



        FeatureInfo[] requestedFeatures = getPackageInfo(context, userId, packageName).reqFeatures;

        if (requestedFeatures != null) {

            for (int i = 0; i < requestedFeatures.length; i++) {

                if (requiredFeature.equals(requestedFeatures[i].name)) {

                    return;

                }

            }

        }



        throw new IllegalStateException("Must declare uses-feature "

                + requiredFeature