Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc58c66 authored Jan 29, 2015 by Fyodor Kupolov

Removed userHandle from setXXX methods

User handle is now extracted from UID of the calling process.

Previously setXXX methods may not work properly, if userHandle parameter
was different from a user of the calling process. In practice, this wouldn't
have happened because setters were always called with a userHandle of the
caller process.

Bug:17202572
Change-Id: I1c08c54c975a04b8c54719a1e280ad3cfaff2e67

parent cd4c8525

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

+20 −21

Original line number	Diff line number	Diff line
		@@ -694,7 +694,7 @@ public class DevicePolicyManager {
		public void setPasswordQuality(ComponentName admin, int quality) {
		if (mService != null) {
		try {
		mService.setPasswordQuality(admin, quality, UserHandle.myUserId());
		mService.setPasswordQuality(admin, quality);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -747,7 +747,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumLength(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumLength(admin, length, UserHandle.myUserId());
		mService.setPasswordMinimumLength(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -801,7 +801,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumUpperCase(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumUpperCase(admin, length, UserHandle.myUserId());
		mService.setPasswordMinimumUpperCase(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -862,7 +862,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumLowerCase(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumLowerCase(admin, length, UserHandle.myUserId());
		mService.setPasswordMinimumLowerCase(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -922,7 +922,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumLetters(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumLetters(admin, length, UserHandle.myUserId());
		mService.setPasswordMinimumLetters(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -980,7 +980,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumNumeric(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumNumeric(admin, length, UserHandle.myUserId());
		mService.setPasswordMinimumNumeric(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1039,7 +1039,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumSymbols(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumSymbols(admin, length, UserHandle.myUserId());
		mService.setPasswordMinimumSymbols(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1097,7 +1097,7 @@ public class DevicePolicyManager {
		public void setPasswordMinimumNonLetter(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordMinimumNonLetter(admin, length, UserHandle.myUserId());
		mService.setPasswordMinimumNonLetter(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1157,7 +1157,7 @@ public class DevicePolicyManager {
		public void setPasswordHistoryLength(ComponentName admin, int length) {
		if (mService != null) {
		try {
		mService.setPasswordHistoryLength(admin, length, UserHandle.myUserId());
		mService.setPasswordHistoryLength(admin, length);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1189,7 +1189,7 @@ public class DevicePolicyManager {
		public void setPasswordExpirationTimeout(ComponentName admin, long timeout) {
		if (mService != null) {
		try {
		mService.setPasswordExpirationTimeout(admin, timeout, UserHandle.myUserId());
		mService.setPasswordExpirationTimeout(admin, timeout);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1334,7 +1334,7 @@ public class DevicePolicyManager {
		public void setMaximumFailedPasswordsForWipe(ComponentName admin, int num) {
		if (mService != null) {
		try {
		mService.setMaximumFailedPasswordsForWipe(admin, num, UserHandle.myUserId());
		mService.setMaximumFailedPasswordsForWipe(admin, num);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1418,7 +1418,7 @@ public class DevicePolicyManager {
		public boolean resetPassword(String password, int flags) {
		if (mService != null) {
		try {
		return mService.resetPassword(password, flags, UserHandle.myUserId());
		return mService.resetPassword(password, flags);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1442,7 +1442,7 @@ public class DevicePolicyManager {
		public void setMaximumTimeToLock(ComponentName admin, long timeMs) {
		if (mService != null) {
		try {
		mService.setMaximumTimeToLock(admin, timeMs, UserHandle.myUserId());
		mService.setMaximumTimeToLock(admin, timeMs);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1592,7 +1592,7 @@ public class DevicePolicyManager {
		!= android.net.Proxy.PROXY_VALID)
		throw new IllegalArgumentException();
		}
		return mService.setGlobalProxy(admin, hostSpec, exclSpec, UserHandle.myUserId());
		return mService.setGlobalProxy(admin, hostSpec, exclSpec);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1758,7 +1758,7 @@ public class DevicePolicyManager {
		public int setStorageEncryption(ComponentName admin, boolean encrypt) {
		if (mService != null) {
		try {
		return mService.setStorageEncryption(admin, encrypt, UserHandle.myUserId());
		return mService.setStorageEncryption(admin, encrypt);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -1977,7 +1977,7 @@ public class DevicePolicyManager {
		public void setCameraDisabled(ComponentName admin, boolean disabled) {
		if (mService != null) {
		try {
		mService.setCameraDisabled(admin, disabled, UserHandle.myUserId());
		mService.setCameraDisabled(admin, disabled);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -2021,7 +2021,7 @@ public class DevicePolicyManager {
		public void setScreenCaptureDisabled(ComponentName admin, boolean disabled) {
		if (mService != null) {
		try {
		mService.setScreenCaptureDisabled(admin, UserHandle.myUserId(), disabled);
		mService.setScreenCaptureDisabled(admin, disabled);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -2065,7 +2065,7 @@ public class DevicePolicyManager {
		public void setAutoTimeRequired(ComponentName admin, boolean required) {
		if (mService != null) {
		try {
		mService.setAutoTimeRequired(admin, UserHandle.myUserId(), required);
		mService.setAutoTimeRequired(admin, required);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -2106,7 +2106,7 @@ public class DevicePolicyManager {
		public void setKeyguardDisabledFeatures(ComponentName admin, int which) {
		if (mService != null) {
		try {
		mService.setKeyguardDisabledFeatures(admin, which, UserHandle.myUserId());
		mService.setKeyguardDisabledFeatures(admin, which);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		@@ -2688,8 +2688,7 @@ public class DevicePolicyManager {
		PersistableBundle configuration) {
		if (mService != null) {
		try {
		mService.setTrustAgentConfiguration(admin, target, configuration,
		UserHandle.myUserId());
		mService.setTrustAgentConfiguration(admin, target, configuration);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}

core/java/android/app/admin/IDevicePolicyManager.aidl

+20 −20

Original line number	Diff line number	Diff line
		@@ -32,34 +32,34 @@ import java.util.List;
		* {@hide}
		*/
		interface IDevicePolicyManager {
		void setPasswordQuality(in ComponentName who, int quality, int userHandle);
		void setPasswordQuality(in ComponentName who, int quality);
		int getPasswordQuality(in ComponentName who, int userHandle);

		void setPasswordMinimumLength(in ComponentName who, int length, int userHandle);
		void setPasswordMinimumLength(in ComponentName who, int length);
		int getPasswordMinimumLength(in ComponentName who, int userHandle);

		void setPasswordMinimumUpperCase(in ComponentName who, int length, int userHandle);
		void setPasswordMinimumUpperCase(in ComponentName who, int length);
		int getPasswordMinimumUpperCase(in ComponentName who, int userHandle);

		void setPasswordMinimumLowerCase(in ComponentName who, int length, int userHandle);
		void setPasswordMinimumLowerCase(in ComponentName who, int length);
		int getPasswordMinimumLowerCase(in ComponentName who, int userHandle);

		void setPasswordMinimumLetters(in ComponentName who, int length, int userHandle);
		void setPasswordMinimumLetters(in ComponentName who, int length);
		int getPasswordMinimumLetters(in ComponentName who, int userHandle);

		void setPasswordMinimumNumeric(in ComponentName who, int length, int userHandle);
		void setPasswordMinimumNumeric(in ComponentName who, int length);
		int getPasswordMinimumNumeric(in ComponentName who, int userHandle);

		void setPasswordMinimumSymbols(in ComponentName who, int length, int userHandle);
		void setPasswordMinimumSymbols(in ComponentName who, int length);
		int getPasswordMinimumSymbols(in ComponentName who, int userHandle);

		void setPasswordMinimumNonLetter(in ComponentName who, int length, int userHandle);
		void setPasswordMinimumNonLetter(in ComponentName who, int length);
		int getPasswordMinimumNonLetter(in ComponentName who, int userHandle);

		void setPasswordHistoryLength(in ComponentName who, int length, int userHandle);
		void setPasswordHistoryLength(in ComponentName who, int length);
		int getPasswordHistoryLength(in ComponentName who, int userHandle);

		void setPasswordExpirationTimeout(in ComponentName who, long expiration, int userHandle);
		void setPasswordExpirationTimeout(in ComponentName who, long expiration);
		long getPasswordExpirationTimeout(in ComponentName who, int userHandle);

		long getPasswordExpiration(in ComponentName who, int userHandle);
		@@ -68,33 +68,33 @@ interface IDevicePolicyManager {
		int getCurrentFailedPasswordAttempts(int userHandle);
		int getProfileWithMinimumFailedPasswordsForWipe(int userHandle);

		void setMaximumFailedPasswordsForWipe(in ComponentName admin, int num, int userHandle);
		void setMaximumFailedPasswordsForWipe(in ComponentName admin, int num);
		int getMaximumFailedPasswordsForWipe(in ComponentName admin, int userHandle);

		boolean resetPassword(String password, int flags, int userHandle);
		boolean resetPassword(String password, int flags);

		void setMaximumTimeToLock(in ComponentName who, long timeMs, int userHandle);
		void setMaximumTimeToLock(in ComponentName who, long timeMs);
		long getMaximumTimeToLock(in ComponentName who, int userHandle);

		void lockNow();

		void wipeData(int flags, int userHandle);

		ComponentName setGlobalProxy(in ComponentName admin, String proxySpec, String exclusionList, int userHandle);
		ComponentName setGlobalProxy(in ComponentName admin, String proxySpec, String exclusionList);
		ComponentName getGlobalProxyAdmin(int userHandle);
		void setRecommendedGlobalProxy(in ComponentName admin, in ProxyInfo proxyInfo);

		int setStorageEncryption(in ComponentName who, boolean encrypt, int userHandle);
		int setStorageEncryption(in ComponentName who, boolean encrypt);
		boolean getStorageEncryption(in ComponentName who, int userHandle);
		int getStorageEncryptionStatus(int userHandle);

		void setCameraDisabled(in ComponentName who, boolean disabled, int userHandle);
		void setCameraDisabled(in ComponentName who, boolean disabled);
		boolean getCameraDisabled(in ComponentName who, int userHandle);

		void setScreenCaptureDisabled(in ComponentName who, int userHandle, boolean disabled);
		void setScreenCaptureDisabled(in ComponentName who, boolean disabled);
		boolean getScreenCaptureDisabled(in ComponentName who, int userHandle);

		void setKeyguardDisabledFeatures(in ComponentName who, int which, int userHandle);
		void setKeyguardDisabledFeatures(in ComponentName who, int which);
		int getKeyguardDisabledFeatures(in ComponentName who, int userHandle);

		void setActiveAdmin(in ComponentName policyReceiver, boolean refreshing, int userHandle);
		@@ -186,7 +186,7 @@ interface IDevicePolicyManager {
		boolean getCrossProfileCallerIdDisabledForUser(int userId);

		void setTrustAgentConfiguration(in ComponentName admin, in ComponentName agent,
		in PersistableBundle args, int userId);
		in PersistableBundle args);
		List<PersistableBundle> getTrustAgentConfiguration(in ComponentName admin,
		in ComponentName agent, int userId);

		@@ -194,7 +194,7 @@ interface IDevicePolicyManager {
		boolean removeCrossProfileWidgetProvider(in ComponentName admin, String packageName);
		List<String> getCrossProfileWidgetProviders(in ComponentName admin);

		void setAutoTimeRequired(in ComponentName who, int userHandle, boolean required);
		void setAutoTimeRequired(in ComponentName who, boolean required);
		boolean getAutoTimeRequired();

		boolean isRemovingAdmin(in ComponentName adminReceiver, int userHandle);

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+41 −45

File changed.

Preview size limit exceeded, changes collapsed.