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

Commit 79a41ea5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Allow verifier to be optional" into oc-dev am: 8ffd8f78 am: 72287ab7"

parents 9dd861c3 4ba80183

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

+8 −4
Original line number Diff line number Diff line
@@ -2805,8 +2805,12 @@ public class PackageManagerService extends IPackageManager.Stub 
                mRequiredInstallerPackage = getRequiredInstallerLPr();

                mRequiredUninstallerPackage = getRequiredUninstallerLPr();

                mIntentFilterVerifierComponent = getIntentFilterVerifierComponentNameLPr();

                if (mIntentFilterVerifierComponent != null) {

                    mIntentFilterVerifier = new IntentVerifierProxy(mContext,

                            mIntentFilterVerifierComponent);

                } else {

                    mIntentFilterVerifier = null;

                }

                mServicesSystemSharedLibraryPackageName = getRequiredSharedLibraryLPr(

                        PackageManager.SYSTEM_SHARED_LIBRARY_SERVICES,

                        SharedLibraryInfo.VERSION_UNDEFINED);
@@ -3046,9 +3050,9 @@ public class PackageManagerService extends IPackageManager.Stub 














        if (best != null) {















            return best.getComponentInfo().getComponentName();













        } else {













            throw new RuntimeException("There must be at least one intent filter verifier");















        }













        Slog.w(TAG, "Intent filter verifier not found");













        return null;















    }





























    private @Nullable Pair<ComponentName, String> getInstantAppResolverLPr() {