summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorRich Cannings <richc@google.com>2012-08-08 13:50:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-08 13:50:56 -0700
commita56d9cecee8a34e0554770ac6253dd3a76b9199c (patch)
tree3e617e7c34c9dafec25b373af7cd392154881b19 /test-runner
parentf007bd3cf8cacd75287781c1bb37fe4167c79cba (diff)
parente1d7c711df3e3a2d2f195457882aa4ddb5626167 (diff)
downloadframeworks_base-a56d9cecee8a34e0554770ac6253dd3a76b9199c.zip
frameworks_base-a56d9cecee8a34e0554770ac6253dd3a76b9199c.tar.gz
frameworks_base-a56d9cecee8a34e0554770ac6253dd3a76b9199c.tar.bz2
Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockPackageManager.java12
1 files changed, 1 insertions, 11 deletions
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index b1224d3..0399b3b 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
@@ -563,17 +563,7 @@ public class MockPackageManager extends PackageManager {
@Override
public void installPackageWithVerification(Uri packageURI, IPackageInstallObserver observer,
int flags, String installerPackageName, Uri verificationURI,
- ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams,
- Uri originatingURI, Uri referrer) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * @hide
- */
- @Override
- public void installPackageWithOrigin(Uri packageURI, IPackageInstallObserver observer,
- int flags, String installerPackageName, Uri originatingURI, Uri referrer) {
+ ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams) {
throw new UnsupportedOperationException();
}