Merge "[Multi-user] add PackageInstaller.installExistingPackage with... (87152609) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -11375,6 +11375,7 @@ package android.content.pm {
		method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getMySessions();
		method @Nullable public android.content.pm.PackageInstaller.SessionInfo getSessionInfo(int);
		method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getStagedSessions();
		method @RequiresPermission(allOf={android.Manifest.permission.INSTALL_PACKAGES, "com.android.permission.INSTALL_EXISTING_PACKAGES"}) public void installExistingPackage(@NonNull String, int, @Nullable android.content.IntentSender);
		method @NonNull public android.content.pm.PackageInstaller.Session openSession(int) throws java.io.IOException;
		method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback);
		method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback, @NonNull android.os.Handler);

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -1593,8 +1593,8 @@ package android.content.pm {
		method @android.content.pm.PackageManager.PermissionFlags @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS}) public abstract int getPermissionFlags(String, String, @NonNull android.os.UserHandle);
		method @NonNull @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] getUnsuspendablePackages(@NonNull String[]);
		method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);
		method public abstract int installExistingPackage(String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract int installExistingPackage(String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method @Deprecated public abstract int installExistingPackage(String) throws android.content.pm.PackageManager.NameNotFoundException;
		method @Deprecated public abstract int installExistingPackage(String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceiversAsUser(android.content.Intent, int, android.os.UserHandle);
		method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentActivitiesAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle);
		method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProvidersAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle);

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -50,5 +50,8 @@ interface IPackageInstaller {
		void uninstall(in VersionedPackage versionedPackage, String callerPackageName, int flags,
		in IntentSender statusReceiver, int userId);

		void installExistingPackage(String packageName, int installFlags, int installReason,
		in IntentSender statusReceiver, int userId);

		void setPermissionsResult(int sessionId, boolean accepted);
		}

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -590,6 +590,30 @@ public class PackageInstaller {
		}
		}

		/**
		* Install the given package, which already exists on the device, for the user for which this
		* installer was created.
		*
		* @param packageName The package to install.
		* @param installReason Reason for install.
		* @param statusReceiver Where to deliver the result.
		*/
		@RequiresPermission(allOf = {
		Manifest.permission.INSTALL_PACKAGES,
		Manifest.permission.INSTALL_EXISTING_PACKAGES})
		public void installExistingPackage(@NonNull String packageName,
		@InstallReason int installReason,
		@Nullable IntentSender statusReceiver) {
		Preconditions.checkNotNull(packageName, "packageName cannot be null");
		try {
		mInstaller.installExistingPackage(packageName, 0, installReason, statusReceiver,
		mUserId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}


		/** {@hide} */
		@SystemApi
		@RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES)

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -5122,7 +5122,10 @@ public abstract class PackageManager {
		* If there is already an application with the given package name installed
		* on the system for other users, also install it for the calling user.
		* @hide
		*
		* @deprecated use {@link PackageInstaller#installExistingPackage()} instead.
		*/
		@Deprecated
		@SystemApi
		public abstract int installExistingPackage(String packageName) throws NameNotFoundException;

		@@ -5130,7 +5133,10 @@ public abstract class PackageManager {
		* If there is already an application with the given package name installed
		* on the system for other users, also install it for the calling user.
		* @hide
		*
		* @deprecated use {@link PackageInstaller#installExistingPackage()} instead.
		*/
		@Deprecated
		@SystemApi
		public abstract int installExistingPackage(String packageName, @InstallReason int installReason)
		throws NameNotFoundException;
		@@ -5139,7 +5145,10 @@ public abstract class PackageManager {
		* If there is already an application with the given package name installed
		* on the system for other users, also install it for the specified user.
		* @hide
		*
		* @deprecated use {@link PackageInstaller#installExistingPackage()} instead.
		*/
		@Deprecated
		@RequiresPermission(anyOf = {
		Manifest.permission.INSTALL_EXISTING_PACKAGES,
		Manifest.permission.INSTALL_PACKAGES,