Merge "Refactoring canSuspendPackage to support batch queries" (0995402a) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

core/java/android/app/ApplicationPackageManager.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2299,9 +2299,9 @@ public class ApplicationPackageManager extends PackageManager {
	}		}

	@Override		@Override
	public boolean canSuspendPackage(String packageName) {		public String[] getUnsuspendablePackages(String[] packageNames) {
	try {		try {
	return mPM.canSuspendPackageForUser(packageName, mContext.getUserId());		return mPM.getUnsuspendablePackagesForUser(packageNames, mContext.getUserId());
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowFromSystemServer();
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -277,7 +277,7 @@ interface IPackageManager {
	in PersistableBundle appExtras, in PersistableBundle launcherExtras,		in PersistableBundle appExtras, in PersistableBundle launcherExtras,
	in SuspendDialogInfo dialogInfo, String callingPackage, int userId);		in SuspendDialogInfo dialogInfo, String callingPackage, int userId);

	boolean canSuspendPackageForUser(String packageName, int userId);		String[] getUnsuspendablePackagesForUser(in String[] packageNames, int userId);

	boolean isPackageSuspendedForUser(String packageName, int userId);		boolean isPackageSuspendedForUser(String packageName, int userId);

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

+11 −10

Original line number	Original line	Diff line number	Diff line
	@@ -5969,27 +5969,28 @@ public abstract class PackageManager {
	}		}

	/**		/**
	* Returns whether or not a given package can be suspended via a call to {@link		* Returns any packages in a given set of packages that cannot be suspended via a call to {@link
	* #setPackagesSuspended(String[], boolean, PersistableBundle, PersistableBundle,		* #setPackagesSuspended(String[], boolean, PersistableBundle, PersistableBundle,
	* SuspendDialogInfo) setPackagesSuspended}. The platform prevents suspending certain critical		* SuspendDialogInfo) setPackagesSuspended}. The platform prevents suspending certain critical
	* packages to keep the device in a functioning state, e.g. the default dialer.		* packages to keep the device in a functioning state, e.g. the default dialer.
	* Apps need to hold {@link Manifest.permission#SUSPEND_APPS SUSPEND_APPS} to call this api.		* Apps need to hold {@link Manifest.permission#SUSPEND_APPS SUSPEND_APPS} to call this api.
	*		*
	* <p>		* <p>
	* Note that this set of critical packages can change with time, so <em>a value of {@code true}		* Note that this set of critical packages can change with time, so even though a package name
	* returned by this api does not guarantee that a following call to {@link		* was not returned by this call, it does not guarantee that a subsequent call to
	* #setPackagesSuspended(String[], boolean, PersistableBundle, PersistableBundle,		* {@link #setPackagesSuspended(String[], boolean, PersistableBundle, PersistableBundle,
	* SuspendDialogInfo) setPackagesSuspended} for the same package will succeed</em>, especially		* SuspendDialogInfo) setPackagesSuspended} for that package will succeed, especially if
	* if considerable time elapsed between the two calls.		* significant time elapsed between the two calls.
	*		*
	* @param packageName The package to check.		* @param packageNames The packages to check.
	* @return {@code true} if the given package can be suspended, {@code false} otherwise.		* @return A list of packages that can not be currently suspended by the system.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@RequiresPermission(Manifest.permission.SUSPEND_APPS)		@RequiresPermission(Manifest.permission.SUSPEND_APPS)
	public boolean canSuspendPackage(@NonNull String packageName) {		@NonNull
	throw new UnsupportedOperationException("canSuspendPackage not implemented");		public String[] getUnsuspendablePackages(@NonNull String[] packageNames) {
			throw new UnsupportedOperationException("canSuspendPackages not implemented");
	}		}

	/**		/**

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

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -13021,20 +13021,26 @@ public class PackageManagerService extends IPackageManager.Stub
	}		}

	@Override		@Override
	public boolean canSuspendPackageForUser(String packageName, int userId) {		public String[] getUnsuspendablePackagesForUser(String[] packageNames, int userId) {
	mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS,		mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS,
	"canSuspendPackageForUser");		"getUnsuspendablePackagesForUser");
	final int callingUid = Binder.getCallingUid();		final int callingUid = Binder.getCallingUid();
	if (UserHandle.getUserId(callingUid) != userId) {		if (UserHandle.getUserId(callingUid) != userId) {
	throw new SecurityException("Calling uid " + callingUid		throw new SecurityException("Calling uid " + callingUid
	+ " cannot query canSuspendPackageForUser for user " + userId);		+ " cannot query getUnsuspendablePackagesForUser for user " + userId);
	}		}
			final ArraySet<String> unactionablePackages = new ArraySet<>();
	final long identity = Binder.clearCallingIdentity();		final long identity = Binder.clearCallingIdentity();
	try {		try {
	return canSuspendPackageForUserInternal(packageName, userId);		for (String packageName : packageNames) {
			if (!canSuspendPackageForUserInternal(packageName, userId)) {
			unactionablePackages.add(packageName);
			}
			}
	} finally {		} finally {
	Binder.restoreCallingIdentity(identity);		Binder.restoreCallingIdentity(identity);
	}		}
			return unactionablePackages.toArray(new String[unactionablePackages.size()]);
	}		}

	private boolean canSuspendPackageForUserInternal(String packageName, int userId) {		private boolean canSuspendPackageForUserInternal(String packageName, int userId) {

Original line number	Original line	Diff line number	Diff line
	@@ -1221,7 +1221,6 @@ package android.content.pm {
	public abstract class PackageManager {		public abstract class PackageManager {
	method public abstract void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);		method public abstract void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
	method public abstract boolean arePermissionsIndividuallyControlled();		method public abstract boolean arePermissionsIndividuallyControlled();
	method public boolean canSuspendPackage(java.lang.String);
	method public abstract java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String);		method public abstract java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String);
	method public android.content.pm.ApplicationInfo getApplicationInfoAsUser(java.lang.String, int, android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;		method public android.content.pm.ApplicationInfo getApplicationInfoAsUser(java.lang.String, int, android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;
	method public android.content.pm.dex.ArtManager getArtManager();		method public android.content.pm.dex.ArtManager getArtManager();
	@@ -1235,6 +1234,7 @@ package android.content.pm {
	method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);		method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);
	method public abstract int getIntentVerificationStatusAsUser(java.lang.String, int);		method public abstract int getIntentVerificationStatusAsUser(java.lang.String, int);
	method public abstract int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);		method public abstract int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);
			method public java.lang.String[] getUnsuspendablePackages(java.lang.String[]);
	method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);		method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
	method public abstract int installExistingPackage(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;		method public abstract int installExistingPackage(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
	method public abstract int installExistingPackage(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;		method public abstract int installExistingPackage(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;