From a503a0f5d407fd10528e26b6eaed0e4e1d3badc1 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 3 Oct 2011 14:45:28 -0700 Subject: [PATCH] Add explicit mimetype for verifier calls Change-Id: I29ffb216680aa24fd9ca3fb4d190038f6d724cb9 --- .../java/com/android/server/pm/PackageManagerService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index eb135b7c41a06..19dd606fe1889 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -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 receivers = queryIntentReceivers(verification, null,