diff options
author | Rich Cannings <richc@google.com> | 2012-08-08 13:50:55 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-08 13:50:56 -0700 |
commit | a56d9cecee8a34e0554770ac6253dd3a76b9199c (patch) | |
tree | 3e617e7c34c9dafec25b373af7cd392154881b19 /cmds | |
parent | f007bd3cf8cacd75287781c1bb37fe4167c79cba (diff) | |
parent | e1d7c711df3e3a2d2f195457882aa4ddb5626167 (diff) | |
download | frameworks_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 'cmds')
-rw-r--r-- | cmds/pm/src/com/android/commands/pm/Pm.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java index 4311c06..4cb5270 100644 --- a/cmds/pm/src/com/android/commands/pm/Pm.java +++ b/cmds/pm/src/com/android/commands/pm/Pm.java @@ -782,7 +782,6 @@ public final class Pm { String macAlgo = null; byte[] macKey = null; byte[] tag = null; - String referrer = null; while ((opt=nextOption()) != null) { if (opt.equals("-l")) { @@ -846,13 +845,6 @@ public final class Pm { showUsage(); return; } - } else if (opt.equals("--referrer")) { - referrer = nextOptionData(); - if (referrer == null) { - System.err.println("Error: must supply argument for --referrer"); - showUsage(); - return; - } } else { System.err.println("Error: Unknown option: " + opt); showUsage(); @@ -900,13 +892,6 @@ public final class Pm { final Uri apkURI; final Uri verificationURI; - final Uri referrerURI; - - if (referrer != null) { - referrerURI = Uri.parse(referrer); - } else { - referrerURI = null; - } // Populate apkURI, must be present final String apkFilePath = nextArg(); @@ -931,7 +916,7 @@ public final class Pm { PackageInstallObserver obs = new PackageInstallObserver(); try { mPm.installPackageWithVerification(apkURI, obs, installFlags, installerPackageName, - verificationURI, null, encryptionParams, apkURI, referrerURI); + verificationURI, null, encryptionParams); synchronized (obs) { while (!obs.finished) { @@ -1451,8 +1436,7 @@ public final class Pm { System.err.println(" pm list libraries"); System.err.println(" pm path PACKAGE"); System.err.println(" pm install [-l] [-r] [-t] [-i INSTALLER_PACKAGE_NAME] [-s] [-f]"); - System.err.println(" [--algo <algorithm name> --key <key-in-hex> --iv <IV-in-hex>]"); - System.err.println(" [--referrer <URI>] PATH"); + System.err.println(" [--algo <algorithm name> --key <key-in-hex> --iv <IV-in-hex>] PATH"); System.err.println(" pm uninstall [-k] PACKAGE"); System.err.println(" pm clear PACKAGE"); System.err.println(" pm enable PACKAGE_OR_COMPONENT"); |