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

Merge "Add explicit mimetype for verifier calls"

Browse Source
This commit is contained in:
Kenny Root
2011-10-04 09:04:06 -07:00
committed by Android (Google) Code Review
parent 62abf34d0d a503a0f5d4
commit afb119c5e1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -753,7 +753,7 @@ public class PackageManagerService extends IPackageManager.Stub {
if (state != null) {
final InstallArgs args = state.getInstallArgs();
Slog.i(TAG, "Validation timed out for " + args.packageURI.toString());
Slog.i(TAG, "Verification timed out for " + args.packageURI.toString());
mPendingVerification.remove(verificationId);
int ret = PackageManager.INSTALL_FAILED_VERIFICATION_TIMEOUT;
@@ -769,7 +769,7 @@ public class PackageManagerService extends IPackageManager.Stub {
final PackageVerificationState state = mPendingVerification.get(verificationId);
if (state == null) {
Slog.w(TAG, "Invalid validation token " + verificationId + " received");
Slog.w(TAG, "Invalid verification token " + verificationId + " received");
break;
}
@@ -5464,8 +5464,8 @@ public class PackageManagerService extends IPackageManager.Stub {
final int requiredUid = mRequiredVerifierPackage == null ? -1
: getPackageUid(mRequiredVerifierPackage);
if (requiredUid != -1 && isVerificationEnabled()) {
final Intent verification = new Intent(
Intent.ACTION_PACKAGE_NEEDS_VERIFICATION, packageURI);
final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
verification.setDataAndType(packageURI, PACKAGE_MIME_TYPE);
verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
final List<ResolveInfo> receivers = queryIntentReceivers(verification, null,