Merge "Suspend packages - one call for multiple packages" into nyc-dev (3e7bfe98) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5929,7 +5929,7 @@ package android.app.admin {
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		method public void setOrganizationColor(android.content.ComponentName, int);
		method public void setOrganizationName(android.content.ComponentName, java.lang.String);
		method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean);
		method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean);
		method public void setPasswordExpirationTimeout(android.content.ComponentName, long);
		method public void setPasswordHistoryLength(android.content.ComponentName, int);
		method public void setPasswordMinimumLength(android.content.ComponentName, int);

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -6075,7 +6075,7 @@ package android.app.admin {
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		method public void setOrganizationColor(android.content.ComponentName, int);
		method public void setOrganizationName(android.content.ComponentName, java.lang.String);
		method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean);
		method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean);
		method public void setPasswordExpirationTimeout(android.content.ComponentName, long);
		method public void setPasswordHistoryLength(android.content.ComponentName, int);
		method public void setPasswordMinimumLength(android.content.ComponentName, int);

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5931,7 +5931,7 @@ package android.app.admin {
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		method public void setOrganizationColor(android.content.ComponentName, int);
		method public void setOrganizationName(android.content.ComponentName, java.lang.String);
		method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean);
		method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean);
		method public void setPasswordExpirationTimeout(android.content.ComponentName, long);
		method public void setPasswordHistoryLength(android.content.ComponentName, int);
		method public void setPasswordMinimumLength(android.content.ComponentName, int);

core/java/android/app/ApplicationPackageManager.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -1907,13 +1907,14 @@ public class ApplicationPackageManager extends PackageManager {
		}

		@Override
		public boolean setPackageSuspendedAsUser(String packageName, boolean suspended, int userId) {
		public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended,
		int userId) {
		try {
		return mPM.setPackageSuspendedAsUser(packageName, suspended, userId);
		return mPM.setPackagesSuspendedAsUser(packageNames, suspended, userId);
		} catch (RemoteException e) {
		// Should never happen!
		}
		return false;
		return packageNames;
		}

		@Override

core/java/android/app/admin/DevicePolicyManager.java

+16 −12

Original line number	Diff line number	Diff line
		@@ -3472,27 +3472,31 @@ public class DevicePolicyManager {
		}

		/**
		* Called by device or profile owners for setting the package suspended for this user.
		* A suspended package will not be started by the package manager, its notifications will
		* be hidden and it will not show up in recents. The package must already be installed.
		* Called by device or profile owners to suspend packages for this user.
		*
		* <p>A suspended package will not be able to start activities. Its notifications will
		* be hidden, it will not show up in recents, will not be able to show toasts or dialogs
		* or ring the device.
		*
		* <p>The package must already be installed.
		*
		* @param admin The name of the admin component to check.
		* @param packageName The package name of the app to suspend or unsuspend.
		* @param suspended If set to {@code true} than the package will be suspended, if set to
		* {@code false} the package will be unsuspended.
		* @return boolean {@code true} if the operation was successfully performed, {@code false}
		* otherwise.
		* @param packageNames The package names to suspend or unsuspend.
		* @param suspended If set to {@code true} than the packages will be suspended, if set to
		* {@code false} the packages will be unsuspended.
		* @return an array of package names for which the suspended status is not set as requested in
		* this method.
		*/
		public boolean setPackageSuspended(@NonNull ComponentName admin, String packageName,
		public String[] setPackagesSuspended(@NonNull ComponentName admin, String[] packageNames,
		boolean suspended) {
		if (mService != null) {
		try {
		return mService.setPackageSuspended(admin, packageName, suspended);
		return mService.setPackagesSuspended(admin, packageNames, suspended);
		} catch (RemoteException re) {
		Log.w(TAG, "Failed talking with device policy service", re);
		}
		}
		return false;
		return packageNames;
		}

		/**
		@@ -3501,7 +3505,7 @@ public class DevicePolicyManager {
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
		* @param packageName The name of the package to retrieve the suspended status of.
		* @return {@code true} if the package is suspended or {@code false} if the package is not
		* suspended, could not be found or an error occured.
		* suspended, could not be found or an error occurred.
		*/
		public boolean getPackageSuspended(@NonNull ComponentName admin, String packageName) {
		if (mService != null) {