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

Commit 06a345d2 authored by Guojing Yuan's avatar Guojing Yuan
Browse files

Fix NPE for the feature flag check 

Bug: 237723969

Test: Tested via GTS

Change-Id: I40b0e4c2327cfead0cf3685329646f1d707c70fd
parent 0c97e288

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