Merge "Allow verifier to be optional" into oc-dev (8ffd8f78) · Commits · e / os / android_frameworks_base

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() {