Merge "Update PackageInstaller install handing" (02714165) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9167,6 +9167,7 @@ package android.content.pm {
		method public void setAppLabel(java.lang.CharSequence);
		method public void setAppPackageName(java.lang.String);
		method public void setInstallLocation(int);
		method public void setOriginatingUid(int);
		method public void setOriginatingUri(android.net.Uri);
		method public void setReferrerUri(android.net.Uri);
		method public void setSize(long);

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9451,6 +9451,7 @@ package android.content.pm {
		method public void setAppPackageName(java.lang.String);
		method public void setGrantedRuntimePermissions(java.lang.String[]);
		method public void setInstallLocation(int);
		method public void setOriginatingUid(int);
		method public void setOriginatingUri(android.net.Uri);
		method public void setReferrerUri(android.net.Uri);
		method public void setSize(long);

core/java/android/content/pm/PackageInstaller.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -867,6 +867,9 @@ public class PackageInstaller {
		*/
		public static final int MODE_INHERIT_EXISTING = 2;

		/** {@hide} */
		public static final int UID_UNKNOWN = -1;

		/** {@hide} */
		public int mode = MODE_INVALID;
		/** {@hide} */
		@@ -886,6 +889,8 @@ public class PackageInstaller {
		/** {@hide} */
		public Uri originatingUri;
		/** {@hide} */
		public int originatingUid = UID_UNKNOWN;
		/** {@hide} */
		public Uri referrerUri;
		/** {@hide} */
		public String abiOverride;
		@@ -915,6 +920,7 @@ public class PackageInstaller {
		appIcon = source.readParcelable(null);
		appLabel = source.readString();
		originatingUri = source.readParcelable(null);
		originatingUid = source.readInt();
		referrerUri = source.readParcelable(null);
		abiOverride = source.readString();
		volumeUuid = source.readString();
		@@ -982,6 +988,15 @@ public class PackageInstaller {
		this.originatingUri = originatingUri;
		}

		/**
		* Sets the UID that initiated package installation. Used for verification purposes.
		*
		* @see PackageManager#EXTRA_VERIFICATION_INSTALLER_UID
		*/
		public void setOriginatingUid(int originatingUid) {
		this.originatingUid = originatingUid;
		}

		/**
		* Optionally set the URI that referred you to install this package. Used
		* for verification purposes.
		@@ -1021,6 +1036,11 @@ public class PackageInstaller {
		installFlags &= ~PackageManager.INSTALL_INTERNAL;
		}

		/** {@hide} */
		public void setInstallFlagsForcePermissionPrompt() {
		installFlags \|= PackageManager.INSTALL_FORCE_PERMISSION_PROMPT;
		}

		/** {@hide} */
		public void dump(IndentingPrintWriter pw) {
		pw.printPair("mode", mode);
		@@ -1031,6 +1051,7 @@ public class PackageInstaller {
		pw.printPair("appIcon", (appIcon != null));
		pw.printPair("appLabel", appLabel);
		pw.printPair("originatingUri", originatingUri);
		pw.printPair("originatingUid", originatingUid);
		pw.printPair("referrerUri", referrerUri);
		pw.printPair("abiOverride", abiOverride);
		pw.printPair("volumeUuid", volumeUuid);
		@@ -1053,6 +1074,7 @@ public class PackageInstaller {
		dest.writeParcelable(appIcon, flags);
		dest.writeString(appLabel);
		dest.writeParcelable(originatingUri, flags);
		dest.writeInt(originatingUid);
		dest.writeParcelable(referrerUri, flags);
		dest.writeString(abiOverride);
		dest.writeString(volumeUuid);

core/java/android/content/pm/PackageManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -421,6 +421,15 @@ public abstract class PackageManager {
		/** {@hide} */
		public static final int INSTALL_FORCE_VOLUME_UUID = 0x00000200;

		/**
		* Flag parameter for {@link #installPackage} to indicate that we always want to force
		* the prompt for permission approval. This overrides any special behaviour for internal
		* components.
		*
		* @hide
		*/
		public static final int INSTALL_FORCE_PERMISSION_PROMPT = 0x00000400;

		/**
		* Flag parameter for
		* {@link #setComponentEnabledSetting(android.content.ComponentName, int, int)} to indicate

services/core/java/com/android/server/pm/PackageInstallerService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
		private static final String ATTR_APP_ICON = "appIcon";
		private static final String ATTR_APP_LABEL = "appLabel";
		private static final String ATTR_ORIGINATING_URI = "originatingUri";
		private static final String ATTR_ORIGINATING_UID = "originatingUid";
		private static final String ATTR_REFERRER_URI = "referrerUri";
		private static final String ATTR_ABI_OVERRIDE = "abiOverride";
		private static final String ATTR_VOLUME_UUID = "volumeUuid";
		@@ -405,6 +406,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
		params.appIcon = readBitmapAttribute(in, ATTR_APP_ICON);
		params.appLabel = readStringAttribute(in, ATTR_APP_LABEL);
		params.originatingUri = readUriAttribute(in, ATTR_ORIGINATING_URI);
		params.originatingUid =
		readIntAttribute(in, ATTR_ORIGINATING_UID, SessionParams.UID_UNKNOWN);
		params.referrerUri = readUriAttribute(in, ATTR_REFERRER_URI);
		params.abiOverride = readStringAttribute(in, ATTR_ABI_OVERRIDE);
		params.volumeUuid = readStringAttribute(in, ATTR_VOLUME_UUID);
		@@ -477,6 +480,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
		writeStringAttribute(out, ATTR_APP_PACKAGE_NAME, params.appPackageName);
		writeStringAttribute(out, ATTR_APP_LABEL, params.appLabel);
		writeUriAttribute(out, ATTR_ORIGINATING_URI, params.originatingUri);
		writeIntAttribute(out, ATTR_ORIGINATING_UID, params.originatingUid);
		writeUriAttribute(out, ATTR_REFERRER_URI, params.referrerUri);
		writeStringAttribute(out, ATTR_ABI_OVERRIDE, params.abiOverride);
		writeStringAttribute(out, ATTR_VOLUME_UUID, params.volumeUuid);