Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow verifier to be optional" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-19 21:51:21 +00:00
committed by Android (Google) Code Review
parent f9f8120e56 e61b60115f
commit 8ffd8f7848
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -2805,8 +2805,12 @@ public class PackageManagerService extends IPackageManager.Stub
mRequiredInstallerPackage = getRequiredInstallerLPr(); mRequiredInstallerPackage = getRequiredInstallerLPr();
mRequiredUninstallerPackage = getRequiredUninstallerLPr(); mRequiredUninstallerPackage = getRequiredUninstallerLPr();
mIntentFilterVerifierComponent = getIntentFilterVerifierComponentNameLPr(); mIntentFilterVerifierComponent = getIntentFilterVerifierComponentNameLPr();
mIntentFilterVerifier = new IntentVerifierProxy(mContext, if (mIntentFilterVerifierComponent != null) {
mIntentFilterVerifierComponent); mIntentFilterVerifier = new IntentVerifierProxy(mContext,
mIntentFilterVerifierComponent);
} else {
mIntentFilterVerifier = null;
}
mServicesSystemSharedLibraryPackageName = getRequiredSharedLibraryLPr( mServicesSystemSharedLibraryPackageName = getRequiredSharedLibraryLPr(
PackageManager.SYSTEM_SHARED_LIBRARY_SERVICES, PackageManager.SYSTEM_SHARED_LIBRARY_SERVICES,
SharedLibraryInfo.VERSION_UNDEFINED); SharedLibraryInfo.VERSION_UNDEFINED);
@@ -3046,9 +3050,9 @@ public class PackageManagerService extends IPackageManager.Stub
if (best != null) { if (best != null) {
return best.getComponentInfo().getComponentName(); 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() { private @Nullable Pair<ComponentName, String> getInstantAppResolverLPr() {