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

Commit a440d94d authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Verifier is required, except when it's not. 

There are still some devices out there that are missing a verifier,
so relax this until we have time to look closer.

Bug: 26438767
Change-Id: I10e154d736619963c20aaed8199a457f3004011c
parent 2d20a4dc

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −3
Original line number Diff line number Diff line
@@ -2363,7 +2363,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    SystemClock.uptimeMillis());















            if (!mOnlyCore) {













                mRequiredVerifierPackage = getRequiredVerifierLPr();













                mRequiredVerifierPackage = getRequiredButNotReallyRequiredVerifierLPr();















                mRequiredInstallerPackage = getRequiredInstallerLPr();















                mIntentFilterVerifierComponent = getIntentFilterVerifierComponentNameLPr();















                mIntentFilterVerifier = new IntentVerifierProxy(mContext,










@@ -2438,7 +2438,7 @@ public class PackageManagerService extends IPackageManager.Stub {













        return mIsUpgrade;















    }



























    private @NonNull String getRequiredVerifierLPr() {













    private @Nullable String getRequiredButNotReallyRequiredVerifierLPr() {















        final Intent intent = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);





























        final List<ResolveInfo> matches = queryIntentReceivers(intent, PACKAGE_MIME_TYPE,









@@ -2446,7 +2446,8 @@ public class PackageManagerService extends IPackageManager.Stub {













        if (matches.size() == 1) {















            return matches.get(0).getComponentInfo().packageName;















        } else {













            throw new RuntimeException("There must be exactly one verifier; found " + matches);













            Log.e(TAG, "There should probably be exactly one verifier; found " + matches);













            return null;















        }















    }