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

Commit 3084bb87 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Disallow disabling of the package installer" into nyc-dev

parents 276b1bc2 81fb0d4a

packages/SettingsLib/src/com/android/settingslib/Utils.java

+8 −1
Original line number Diff line number Diff line
@@ -151,10 +151,17 @@ public class Utils { 
        if (sSystemSignature == null) {

            sSystemSignature = new Signature[]{ getSystemSignature(pm) };

        }

        return sSystemSignature[0] != null && sSystemSignature[0].equals(getFirstSignature(pkg));

        if (sPermissionControllerPackageName == null) {

            sPermissionControllerPackageName = pm.getPermissionControllerPackageName();

        }

        return (sSystemSignature[0] != null

                        && sSystemSignature[0].equals(getFirstSignature(pkg)))

                || (sPermissionControllerPackageName != null

                        && sPermissionControllerPackageName.equals(pkg.packageName));

    }



    private static Signature[] sSystemSignature;

    private static String sPermissionControllerPackageName;



    private static Signature getFirstSignature(PackageInfo pkg) {

        if (pkg != null && pkg.signatures != null && pkg.signatures.length > 0) {