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

Merge "Verifier is required, except when it's not."

Browse Source
This commit is contained in:
Jeff Sharkey
2016-01-08 19:30:59 +00:00
committed by Android (Google) Code Review
parent 69c952f833 a440d94d0f
commit f8565afc8a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}