Merge "Add more explicit documentation for install reason" into oc-dev (c8ca16a8) · Commits · e / os / android_frameworks_base

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.annotation.SystemApi;
		import android.app.ActivityManager;
		import android.content.Intent;
		import android.content.IntentSender;
		import android.content.pm.PackageManager.InstallReason;
		import android.graphics.Bitmap;
		import android.net.Uri;
		import android.os.FileBridge;
		@@ -948,7 +949,7 @@ public class PackageInstaller {
		/** {@hide} */
		public int installLocation = PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY;
		/** {@hide} */
		public int installReason = PackageManager.INSTALL_REASON_UNKNOWN;
		public @InstallReason int installReason = PackageManager.INSTALL_REASON_UNKNOWN;
		/** {@hide} */
		public long sizeBytes = -1;
		/** {@hide} */
		@@ -1146,7 +1147,10 @@ public class PackageInstaller {
		}
		}

		public void setInstallReason(int installReason) {
		/**
		* Set the reason for installing this package.
		*/
		public void setInstallReason(@InstallReason int installReason) {
		this.installReason = installReason;
		}

		@@ -1236,7 +1240,7 @@ public class PackageInstaller {
		/** {@hide} */
		public int mode;
		/** {@hide} */
		public int installReason;
		public @InstallReason int installReason;
		/** {@hide} */
		public long sizeBytes;
		/** {@hide} */
		@@ -1324,9 +1328,9 @@ public class PackageInstaller {
		/**
		* Return the reason for installing this package.
		*
		* @see PackageManager#INSTALL_REASON_UNKNOWN
		* @return The install reason.
		*/
		public int getInstallReason() {
		public @InstallReason int getInstallReason() {
		return installReason;
		}