Merge "Add install reason" (9e064228) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -9944,6 +9944,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 setInstallReason(int);
		method public void setOriginatingUid(int);
		method public void setOriginatingUri(android.net.Uri);
		method public void setReferrerUri(android.net.Uri);
		@@ -10177,6 +10178,8 @@ package android.content.pm {
		field public static final int GET_SIGNATURES = 64; // 0x40
		field public static final deprecated int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
		field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
		field public static final int INSTALL_REASON_POLICY = 1; // 0x1
		field public static final int INSTALL_REASON_UNKNOWN = 0; // 0x0
		field public static final int MATCH_ALL = 131072; // 0x20000
		field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
		field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -10365,6 +10365,7 @@ package android.content.pm {
		method public void setGrantedRuntimePermissions(java.lang.String[]);
		method public void setInstallAsInstantApp(boolean);
		method public void setInstallLocation(int);
		method public void setInstallReason(int);
		method public void setOriginatingUid(int);
		method public void setOriginatingUri(android.net.Uri);
		method public void setReferrerUri(android.net.Uri);
		@@ -10653,6 +10654,8 @@ package android.content.pm {
		field public static final int INSTALL_PARSE_FAILED_NOT_APK = -100; // 0xffffff9c
		field public static final int INSTALL_PARSE_FAILED_NO_CERTIFICATES = -103; // 0xffffff99
		field public static final int INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION = -102; // 0xffffff9a
		field public static final int INSTALL_REASON_POLICY = 1; // 0x1
		field public static final int INSTALL_REASON_UNKNOWN = 0; // 0x0
		field public static final int INSTALL_SUCCEEDED = 1; // 0x1
		field public static final int INTENT_FILTER_VERIFICATION_FAILURE = -1; // 0xffffffff
		field public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; // 0x1

api/test-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -9972,6 +9972,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 setInstallReason(int);
		method public void setOriginatingUid(int);
		method public void setOriginatingUri(android.net.Uri);
		method public void setReferrerUri(android.net.Uri);
		@@ -10044,6 +10045,7 @@ package android.content.pm {
		method public abstract android.graphics.drawable.Drawable getDefaultActivityIcon();
		method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int);
		method public abstract android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public abstract int getInstallReason(java.lang.String, android.os.UserHandle);
		method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
		method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public abstract java.lang.String getInstallerPackageName(java.lang.String);
		@@ -10206,6 +10208,8 @@ package android.content.pm {
		field public static final int GET_SIGNATURES = 64; // 0x40
		field public static final deprecated int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
		field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
		field public static final int INSTALL_REASON_POLICY = 1; // 0x1
		field public static final int INSTALL_REASON_UNKNOWN = 0; // 0x0
		field public static final int MATCH_ALL = 131072; // 0x20000
		field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
		field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000
		@@ -39123,6 +39127,7 @@ package android.test.mock {
		method public android.graphics.drawable.Drawable getDefaultActivityIcon();
		method public java.lang.String getDefaultBrowserPackageNameAsUser(int);
		method public android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public int getInstallReason(java.lang.String, android.os.UserHandle);
		method public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
		method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
		method public java.lang.String getInstallerPackageName(java.lang.String);

core/java/android/app/ApplicationPackageManager.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -1635,7 +1635,8 @@ public class ApplicationPackageManager extends PackageManager {
		public int installExistingPackageAsUser(String packageName, int userId)
		throws NameNotFoundException {
		try {
		int res = mPM.installExistingPackageAsUser(packageName, userId);
		int res = mPM.installExistingPackageAsUser(packageName, userId,
		PackageManager.INSTALL_REASON_UNKNOWN);
		if (res == INSTALL_FAILED_INVALID_URI) {
		throw new NameNotFoundException("Package " + packageName + " doesn't exist");
		}
		@@ -2411,6 +2412,18 @@ public class ApplicationPackageManager extends PackageManager {
		return getUserManager().isManagedProfile(userId);
		}

		/**
		* @hide
		*/
		@Override
		public int getInstallReason(String packageName, UserHandle user) {
		try {
		return mPM.getInstallReason(packageName, user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/** {@hide} */
		private static class MoveCallbackDelegate extends IPackageMoveObserver.Stub implements
		Handler.Callback {

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -523,7 +523,7 @@ interface IPackageManager {
		boolean setInstallLocation(int loc);
		int getInstallLocation();

		int installExistingPackageAsUser(String packageName, int userId);
		int installExistingPackageAsUser(String packageName, int userId, int installReason);

		void verifyPendingInstall(int id, int verificationCode);
		void extendVerificationTimeout(int id, int verificationCodeAtTimeout, long millisecondsToDelay);
		@@ -584,4 +584,6 @@ interface IPackageManager {
		boolean isPackageDeviceAdminOnAnyUser(String packageName);

		List<String> getPreviousCodePaths(in String packageName);

		int getInstallReason(String packageName, int userId);
		}