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 
am: 8ffd8f7848

Change-Id: Ide9c5e7eb6a88b5962cb63f10272a81184b4e4c7
This commit is contained in:
Todd Kennedy
2017-04-19 22:04:33 +00:00
committed by android-build-merger
parent 88522c5f5d 8ffd8f7848
commit 72287ab766
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();
mRequiredUninstallerPackage = getRequiredUninstallerLPr();
mIntentFilterVerifierComponent = getIntentFilterVerifierComponentNameLPr();
mIntentFilterVerifier = new IntentVerifierProxy(mContext,
mIntentFilterVerifierComponent);
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() {