diff options
| author | Kenny Root <kroot@google.com> | 2011-10-04 09:04:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-04 09:04:06 -0700 |
| commit | afb119c5e19fe74bc99fd7ad2c4bcc21612872a5 (patch) | |
| tree | de7b6df3c2ec452192ee3f7de5f81d6ff5fceaf2 /services | |
| parent | 62abf34d0dce0deb017b18beef3d8f73bd90981a (diff) | |
| parent | a503a0f5d407fd10528e26b6eaed0e4e1d3badc1 (diff) | |
| download | frameworks_base-afb119c5e19fe74bc99fd7ad2c4bcc21612872a5.zip frameworks_base-afb119c5e19fe74bc99fd7ad2c4bcc21612872a5.tar.gz frameworks_base-afb119c5e19fe74bc99fd7ad2c4bcc21612872a5.tar.bz2 | |
Merge "Add explicit mimetype for verifier calls"
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 8 |
1 files 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 eb135b7..19dd606 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<ResolveInfo> receivers = queryIntentReceivers(verification, null, |