am 22c5c52d: am a56d9cec: Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev (b38cb4da) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5832,7 +5832,7 @@ package android.content {
	field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT";		field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT";
	field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";		field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";
	field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";		field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";
	field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";		field public static final java.lang.String EXTRA_ORIGINATING_URL = "android.intent.extra.ORIGINATING_URL";
	field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";		field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
	field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";		field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
	field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";		field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";

cmds/pm/src/com/android/commands/pm/Pm.java

+2 −18

Original line number	Original line	Diff line number	Diff line
	@@ -782,7 +782,6 @@ public final class Pm {
	String macAlgo = null;		String macAlgo = null;
	byte[] macKey = null;		byte[] macKey = null;
	byte[] tag = null;		byte[] tag = null;
	String referrer = null;

	while ((opt=nextOption()) != null) {		while ((opt=nextOption()) != null) {
	if (opt.equals("-l")) {		if (opt.equals("-l")) {
	@@ -846,13 +845,6 @@ public final class Pm {
	showUsage();		showUsage();
	return;		return;
	}		}
	} else if (opt.equals("--referrer")) {
	referrer = nextOptionData();
	if (referrer == null) {
	System.err.println("Error: must supply argument for --referrer");
	showUsage();
	return;
	}
	} else {		} else {
	System.err.println("Error: Unknown option: " + opt);		System.err.println("Error: Unknown option: " + opt);
	showUsage();		showUsage();
	@@ -900,13 +892,6 @@ public final class Pm {

	final Uri apkURI;		final Uri apkURI;
	final Uri verificationURI;		final Uri verificationURI;
	final Uri referrerURI;

	if (referrer != null) {
	referrerURI = Uri.parse(referrer);
	} else {
	referrerURI = null;
	}

	// Populate apkURI, must be present		// Populate apkURI, must be present
	final String apkFilePath = nextArg();		final String apkFilePath = nextArg();
	@@ -931,7 +916,7 @@ public final class Pm {
	PackageInstallObserver obs = new PackageInstallObserver();		PackageInstallObserver obs = new PackageInstallObserver();
	try {		try {
	mPm.installPackageWithVerification(apkURI, obs, installFlags, installerPackageName,		mPm.installPackageWithVerification(apkURI, obs, installFlags, installerPackageName,
	verificationURI, null, encryptionParams, apkURI, referrerURI);		verificationURI, null, encryptionParams);

	synchronized (obs) {		synchronized (obs) {
	while (!obs.finished) {		while (!obs.finished) {
	@@ -1451,8 +1436,7 @@ public final class Pm {
	System.err.println(" pm list libraries");		System.err.println(" pm list libraries");
	System.err.println(" pm path PACKAGE");		System.err.println(" pm path PACKAGE");
	System.err.println(" pm install [-l] [-r] [-t] [-i INSTALLER_PACKAGE_NAME] [-s] [-f]");		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(" [--algo <algorithm name> --key <key-in-hex> --iv <IV-in-hex>] PATH");
	System.err.println(" [--referrer <URI>] PATH");
	System.err.println(" pm uninstall [-k] PACKAGE");		System.err.println(" pm uninstall [-k] PACKAGE");
	System.err.println(" pm clear PACKAGE");		System.err.println(" pm clear PACKAGE");
	System.err.println(" pm enable PACKAGE_OR_COMPONENT");		System.err.println(" pm enable PACKAGE_OR_COMPONENT");

core/java/android/app/ApplicationPackageManager.java

+2 −14

Original line number	Original line	Diff line number	Diff line
	@@ -971,25 +971,13 @@ final class ApplicationPackageManager extends PackageManager {
	}		}
	}		}

	@Override
	public void installPackageWithOrigin(Uri packageURI, IPackageInstallObserver observer,
	int flags, String installerPackageName, Uri originatingURI, Uri referrer) {
	try {
	mPM.installPackageWithOrigin(packageURI, observer, flags, null, originatingURI,
	referrer);
	} catch (RemoteException e) {
	// Should never happen!
	}
	}

	@Override		@Override
	public void installPackageWithVerification(Uri packageURI, IPackageInstallObserver observer,		public void installPackageWithVerification(Uri packageURI, IPackageInstallObserver observer,
	int flags, String installerPackageName, Uri verificationURI,		int flags, String installerPackageName, Uri verificationURI,
	ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams,		ManifestDigest manifestDigest, ContainerEncryptionParams encryptionParams) {
	Uri originatingURI, Uri referrer) {
	try {		try {
	mPM.installPackageWithVerification(packageURI, observer, flags, installerPackageName,		mPM.installPackageWithVerification(packageURI, observer, flags, installerPackageName,
	verificationURI, manifestDigest, encryptionParams, originatingURI, referrer);		verificationURI, manifestDigest, encryptionParams);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen!		// Should never happen!
	}		}

core/java/android/content/Intent.java

+8 −8

core/java/android/content/pm/IPackageManager.aidl

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -363,14 +363,9 @@ interface IPackageManager {
	void setUserName(int userId, String name);		void setUserName(int userId, String name);
	ParcelFileDescriptor setUserIcon(int userId);		ParcelFileDescriptor setUserIcon(int userId);

	void installPackageWithOrigin(in Uri packageURI, in IPackageInstallObserver observer,
	int flags, in String installerPackageName, in Uri originatingURI,
	in Uri referrer);

	void installPackageWithVerification(in Uri packageURI, in IPackageInstallObserver observer,		void installPackageWithVerification(in Uri packageURI, in IPackageInstallObserver observer,
	int flags, in String installerPackageName, in Uri verificationURI,		int flags, in String installerPackageName, in Uri verificationURI,
	in ManifestDigest manifestDigest, in ContainerEncryptionParams encryptionParams,		in ManifestDigest manifestDigest, in ContainerEncryptionParams encryptionParams);
	in Uri originatingURI, in Uri referrer);

	void verifyPendingInstall(int id, int verificationCode);		void verifyPendingInstall(int id, int verificationCode);

Original line number	Original line	Diff line number	Diff line
	@@ -571,7 +571,7 @@ import java.util.Set;
	* <li> {@link #EXTRA_INITIAL_INTENTS}		* <li> {@link #EXTRA_INITIAL_INTENTS}
	* <li> {@link #EXTRA_INTENT}		* <li> {@link #EXTRA_INTENT}
	* <li> {@link #EXTRA_KEY_EVENT}		* <li> {@link #EXTRA_KEY_EVENT}
	* <li> {@link #EXTRA_ORIGINATING_URI}		* <li> {@link #EXTRA_ORIGINATING_URL}
	* <li> {@link #EXTRA_PHONE_NUMBER}		* <li> {@link #EXTRA_PHONE_NUMBER}
	* <li> {@link #EXTRA_REFERRER}		* <li> {@link #EXTRA_REFERRER}
	* <li> {@link #EXTRA_REMOTE_INTENT_TOKEN}		* <li> {@link #EXTRA_REMOTE_INTENT_TOKEN}
	@@ -1288,17 +1288,17 @@ public class Intent implements Parcelable, Cloneable {
	= "android.intent.extra.NOT_UNKNOWN_SOURCE";		= "android.intent.extra.NOT_UNKNOWN_SOURCE";

	/**		/**
	* Used as a URI extra field with {@link #ACTION_INSTALL_PACKAGE} and		* Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} and
	* {@link #ACTION_VIEW} to indicate the URI from which the local APK in the Intent		* {@link #ACTION_VIEW} to indicate the URL from which the local APK in the Intent
	* data field originated from.		* data field originated from.
	*/		*/
	public static final String EXTRA_ORIGINATING_URI		public static final String EXTRA_ORIGINATING_URL
	= "android.intent.extra.ORIGINATING_URI";		= "android.intent.extra.ORIGINATING_URL";

	/**		/**
	* Used as a URI extra field with {@link #ACTION_INSTALL_PACKAGE} and		* Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} and
	* {@link #ACTION_VIEW} to indicate the HTTP referrer URI associated with the Intent		* {@link #ACTION_VIEW} to indicate the HTTP referrer associated with the Intent
	* data field or {@link #EXTRA_ORIGINATING_URI}.		* data field or {@link #EXTRA_ORIGINATING_URL}.
	*/		*/
	public static final String EXTRA_REFERRER		public static final String EXTRA_REFERRER
	= "android.intent.extra.REFERRER";		= "android.intent.extra.REFERRER";