Merge "DevicePolicyManager per user" into jb-mr1-dev (4adb9d34) · Commits · e / os / android_frameworks_base

core/java/android/app/PendingIntent.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -413,6 +413,13 @@ public final class PendingIntent implements Parcelable {
		*/
		public static PendingIntent getBroadcast(Context context, int requestCode,
		Intent intent, int flags) {
		return getBroadcastAsUser(context, requestCode, intent, flags,
		new UserHandle(UserHandle.myUserId()));
		}

		/** @hide */
		public static PendingIntent getBroadcastAsUser(Context context, int requestCode,
		Intent intent, int flags, UserHandle userHandle) {
		String packageName = context.getPackageName();
		String resolvedType = intent != null ? intent.resolveTypeIfNeeded(
		context.getContentResolver()) : null;
		@@ -423,7 +430,7 @@ public final class PendingIntent implements Parcelable {
		ActivityManager.INTENT_SENDER_BROADCAST, packageName,
		null, null, requestCode, new Intent[] { intent },
		resolvedType != null ? new String[] { resolvedType } : null,
		flags, null, UserHandle.myUserId());
		flags, null, userHandle.getIdentifier());
		return target != null ? new PendingIntent(target) : null;
		} catch (RemoteException e) {
		}

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

+124 −52

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.os.Handler;
		import android.os.RemoteCallback;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.util.Log;

		import java.io.IOException;
		@@ -131,7 +132,7 @@ public class DevicePolicyManager {
		public boolean isAdminActive(ComponentName who) {
		if (mService != null) {
		try {
		return mService.isAdminActive(who);
		return mService.isAdminActive(who, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -147,7 +148,7 @@ public class DevicePolicyManager {
		public List<ComponentName> getActiveAdmins() {
		if (mService != null) {
		try {
		return mService.getActiveAdmins();
		return mService.getActiveAdmins(UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -156,12 +157,14 @@ public class DevicePolicyManager {
		}

		/**
		* Used by package administration code to determine if a package can be stopped
		* or uninstalled.
		* @hide
		*/
		public boolean packageHasActiveAdmins(String packageName) {
		if (mService != null) {
		try {
		return mService.packageHasActiveAdmins(packageName);
		return mService.packageHasActiveAdmins(packageName, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -178,7 +181,7 @@ public class DevicePolicyManager {
		public void removeActiveAdmin(ComponentName who) {
		if (mService != null) {
		try {
		mService.removeActiveAdmin(who);
		mService.removeActiveAdmin(who, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -197,7 +200,7 @@ public class DevicePolicyManager {
		public boolean hasGrantedPolicy(ComponentName admin, int usesPolicy) {
		if (mService != null) {
		try {
		return mService.hasGrantedPolicy(admin, usesPolicy);
		return mService.hasGrantedPolicy(admin, usesPolicy, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -289,7 +292,7 @@ public class DevicePolicyManager {
		public void setPasswordQuality(ComponentName admin, int quality) {
		if (mService != null) {
		try {
		mService.setPasswordQuality(admin, quality);
		mService.setPasswordQuality(admin, quality, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -303,9 +306,14 @@ public class DevicePolicyManager {
		* all admins.
		*/
		public int getPasswordQuality(ComponentName admin) {
		return getPasswordQuality(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordQuality(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordQuality(admin);
		return mService.getPasswordQuality(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -337,7 +345,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumLength(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumLength(admin, length);
		mService.setPasswordMinimumLength(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -351,9 +359,14 @@ public class DevicePolicyManager {
		* all admins.
		*/
		public int getPasswordMinimumLength(ComponentName admin) {
		return getPasswordMinimumLength(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordMinimumLength(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordMinimumLength(admin);
		return mService.getPasswordMinimumLength(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -386,7 +399,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumUpperCase(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumUpperCase(admin, length);
		mService.setPasswordMinimumUpperCase(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -406,9 +419,14 @@ public class DevicePolicyManager {
		* password.
		*/
		public int getPasswordMinimumUpperCase(ComponentName admin) {
		return getPasswordMinimumUpperCase(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordMinimumUpperCase(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordMinimumUpperCase(admin);
		return mService.getPasswordMinimumUpperCase(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -441,7 +459,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumLowerCase(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumLowerCase(admin, length);
		mService.setPasswordMinimumLowerCase(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -461,9 +479,14 @@ public class DevicePolicyManager {
		* password.
		*/
		public int getPasswordMinimumLowerCase(ComponentName admin) {
		return getPasswordMinimumLowerCase(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordMinimumLowerCase(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordMinimumLowerCase(admin);
		return mService.getPasswordMinimumLowerCase(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -495,7 +518,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumLetters(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumLetters(admin, length);
		mService.setPasswordMinimumLetters(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -514,9 +537,14 @@ public class DevicePolicyManager {
		* @return The minimum number of letters required in the password.
		*/
		public int getPasswordMinimumLetters(ComponentName admin) {
		return getPasswordMinimumLetters(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordMinimumLetters(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordMinimumLetters(admin);
		return mService.getPasswordMinimumLetters(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -548,7 +576,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumNumeric(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumNumeric(admin, length);
		mService.setPasswordMinimumNumeric(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -567,9 +595,14 @@ public class DevicePolicyManager {
		* @return The minimum number of numerical digits required in the password.
		*/
		public int getPasswordMinimumNumeric(ComponentName admin) {
		return getPasswordMinimumNumeric(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordMinimumNumeric(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordMinimumNumeric(admin);
		return mService.getPasswordMinimumNumeric(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -601,7 +634,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumSymbols(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumSymbols(admin, length);
		mService.setPasswordMinimumSymbols(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -620,9 +653,14 @@ public class DevicePolicyManager {
		* @return The minimum number of symbols required in the password.
		*/
		public int getPasswordMinimumSymbols(ComponentName admin) {
		return getPasswordMinimumSymbols(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordMinimumSymbols(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordMinimumSymbols(admin);
		return mService.getPasswordMinimumSymbols(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -654,7 +692,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumNonLetter(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumNonLetter(admin, length);
		mService.setPasswordMinimumNonLetter(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -673,9 +711,14 @@ public class DevicePolicyManager {
		* @return The minimum number of letters required in the password.
		*/
		public int getPasswordMinimumNonLetter(ComponentName admin) {
		return getPasswordMinimumNonLetter(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordMinimumNonLetter(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordMinimumNonLetter(admin);
		return mService.getPasswordMinimumNonLetter(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -708,7 +751,7 @@ public class DevicePolicyManager {
		public void setPasswordHistoryLength(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordHistoryLength(admin, length);
		mService.setPasswordHistoryLength(admin, length, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -737,7 +780,7 @@ public class DevicePolicyManager {
		public void setPasswordExpirationTimeout(ComponentName admin, long timeout) {
		if (mService != null) {
		try {
		mService.setPasswordExpirationTimeout(admin, timeout);
		mService.setPasswordExpirationTimeout(admin, timeout, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -756,7 +799,7 @@ public class DevicePolicyManager {
		public long getPasswordExpirationTimeout(ComponentName admin) {
		if (mService != null) {
		try {
		return mService.getPasswordExpirationTimeout(admin);
		return mService.getPasswordExpirationTimeout(admin, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -776,7 +819,7 @@ public class DevicePolicyManager {
		public long getPasswordExpiration(ComponentName admin) {
		if (mService != null) {
		try {
		return mService.getPasswordExpiration(admin);
		return mService.getPasswordExpiration(admin, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -792,9 +835,14 @@ public class DevicePolicyManager {
		* @return The length of the password history
		*/
		public int getPasswordHistoryLength(ComponentName admin) {
		return getPasswordHistoryLength(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getPasswordHistoryLength(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getPasswordHistoryLength(admin);
		return mService.getPasswordHistoryLength(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -828,7 +876,7 @@ public class DevicePolicyManager {
		public boolean isActivePasswordSufficient() {
		if (mService != null) {
		try {
		return mService.isActivePasswordSufficient();
		return mService.isActivePasswordSufficient(UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -847,7 +895,7 @@ public class DevicePolicyManager {
		public int getCurrentFailedPasswordAttempts() {
		if (mService != null) {
		try {
		return mService.getCurrentFailedPasswordAttempts();
		return mService.getCurrentFailedPasswordAttempts(UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -877,7 +925,7 @@ public class DevicePolicyManager {
		public void setMaximumFailedPasswordsForWipe(ComponentName admin, int num) {
		if (mService != null) {
		try {
		mService.setMaximumFailedPasswordsForWipe(admin, num);
		mService.setMaximumFailedPasswordsForWipe(admin, num, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -892,9 +940,14 @@ public class DevicePolicyManager {
		* all admins.
		*/
		public int getMaximumFailedPasswordsForWipe(ComponentName admin) {
		return getMaximumFailedPasswordsForWipe(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getMaximumFailedPasswordsForWipe(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getMaximumFailedPasswordsForWipe(admin);
		return mService.getMaximumFailedPasswordsForWipe(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -933,7 +986,7 @@ public class DevicePolicyManager {
		public boolean resetPassword(String password, int flags) {
		if (mService != null) {
		try {
		return mService.resetPassword(password, flags);
		return mService.resetPassword(password, flags, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -957,7 +1010,7 @@ public class DevicePolicyManager {
		public void setMaximumTimeToLock(ComponentName admin, long timeMs) {
		if (mService != null) {
		try {
		mService.setMaximumTimeToLock(admin, timeMs);
		mService.setMaximumTimeToLock(admin, timeMs, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -971,9 +1024,14 @@ public class DevicePolicyManager {
		* all admins.
		*/
		public long getMaximumTimeToLock(ComponentName admin) {
		return getMaximumTimeToLock(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public long getMaximumTimeToLock(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getMaximumTimeToLock(admin);
		return mService.getMaximumTimeToLock(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1021,7 +1079,7 @@ public class DevicePolicyManager {
		public void wipeData(int flags) {
		if (mService != null) {
		try {
		mService.wipeData(flags);
		mService.wipeData(flags, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1090,7 +1148,7 @@ public class DevicePolicyManager {
		}
		android.net.Proxy.validate(hostName, Integer.toString(port), exclSpec);
		}
		return mService.setGlobalProxy(admin, hostSpec, exclSpec);
		return mService.setGlobalProxy(admin, hostSpec, exclSpec, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1107,7 +1165,7 @@ public class DevicePolicyManager {
		public ComponentName getGlobalProxyAdmin() {
		if (mService != null) {
		try {
		return mService.getGlobalProxyAdmin();
		return mService.getGlobalProxyAdmin(UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1199,7 +1257,7 @@ public class DevicePolicyManager {
		public int setStorageEncryption(ComponentName admin, boolean encrypt) {
		if (mService != null) {
		try {
		return mService.setStorageEncryption(admin, encrypt);
		return mService.setStorageEncryption(admin, encrypt, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1219,7 +1277,7 @@ public class DevicePolicyManager {
		public boolean getStorageEncryption(ComponentName admin) {
		if (mService != null) {
		try {
		return mService.getStorageEncryption(admin);
		return mService.getStorageEncryption(admin, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1244,9 +1302,14 @@ public class DevicePolicyManager {
		* {@link #ENCRYPTION_STATUS_ACTIVATING}, or{@link #ENCRYPTION_STATUS_ACTIVE}.
		*/
		public int getStorageEncryptionStatus() {
		return getStorageEncryptionStatus(UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getStorageEncryptionStatus(int userHandle) {
		if (mService != null) {
		try {
		return mService.getStorageEncryptionStatus();
		return mService.getStorageEncryptionStatus(userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1269,7 +1332,7 @@ public class DevicePolicyManager {
		public void setCameraDisabled(ComponentName admin, boolean disabled) {
		if (mService != null) {
		try {
		mService.setCameraDisabled(admin, disabled);
		mService.setCameraDisabled(admin, disabled, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1283,9 +1346,14 @@ public class DevicePolicyManager {
		* have disabled the camera
		*/
		public boolean getCameraDisabled(ComponentName admin) {
		return getCameraDisabled(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public boolean getCameraDisabled(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getCameraDisabled(admin);
		return mService.getCameraDisabled(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1309,7 +1377,7 @@ public class DevicePolicyManager {
		public void setKeyguardWidgetsDisabled(ComponentName admin, int which) {
		if (mService != null) {
		try {
		mService.setKeyguardWidgetsDisabled(admin, which);
		mService.setKeyguardWidgetsDisabled(admin, which, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1323,9 +1391,14 @@ public class DevicePolicyManager {
		* have disabled widgets in keyguard.
		*/
		public int getKeyguardWidgetsDisabled(ComponentName admin) {
		return getKeyguardWidgetsDisabled(admin, UserHandle.myUserId());
		}

		/** @hide per-user version */
		public int getKeyguardWidgetsDisabled(ComponentName admin, int userHandle) {
		if (mService != null) {
		try {
		return mService.getKeyguardWidgetsDisabled(admin);
		return mService.getKeyguardWidgetsDisabled(admin, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1339,7 +1412,7 @@ public class DevicePolicyManager {
		public void setActiveAdmin(ComponentName policyReceiver, boolean refreshing) {
		if (mService != null) {
		try {
		mService.setActiveAdmin(policyReceiver, refreshing);
		mService.setActiveAdmin(policyReceiver, refreshing, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1380,7 +1453,7 @@ public class DevicePolicyManager {
		public void getRemoveWarning(ComponentName admin, RemoteCallback result) {
		if (mService != null) {
		try {
		mService.getRemoveWarning(admin, result);
		mService.getRemoveWarning(admin, result, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1391,11 +1464,11 @@ public class DevicePolicyManager {
		* @hide
		*/
		public void setActivePasswordState(int quality, int length, int letters, int uppercase,
		int lowercase, int numbers, int symbols, int nonletter) {
		int lowercase, int numbers, int symbols, int nonletter, int userHandle) {
		if (mService != null) {
		try {
		mService.setActivePasswordState(quality, length, letters, uppercase, lowercase,
		numbers, symbols, nonletter);
		numbers, symbols, nonletter, userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1405,10 +1478,10 @@ public class DevicePolicyManager {
		/**
		* @hide
		*/
		public void reportFailedPasswordAttempt() {
		public void reportFailedPasswordAttempt(int userHandle) {
		if (mService != null) {
		try {
		mService.reportFailedPasswordAttempt();
		mService.reportFailedPasswordAttempt(userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1418,14 +1491,13 @@ public class DevicePolicyManager {
		/**
		* @hide
		*/
		public void reportSuccessfulPasswordAttempt() {
		public void reportSuccessfulPasswordAttempt(int userHandle) {
		if (mService != null) {
		try {
		mService.reportSuccessfulPasswordAttempt();
		mService.reportSuccessfulPasswordAttempt(userHandle);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		}
		}

		}