Merge "Revert "Throw IllegalArgumentException when calling"" (e8b3bbe1) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/LockPatternUtils.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -1103,10 +1103,6 @@ public class LockPatternUtils {
		* {@link #CREDENTIAL_TYPE_PASSWORD}
		*/
		public @CredentialType int getCredentialTypeForUser(int userHandle) {
		if (userHandle < 0) {
		throw new IllegalArgumentException("Invalid userHandle: " + userHandle);
		}

		try {
		return getLockSettings().getCredentialType(userHandle);
		} catch (RemoteException re) {

+0 −12

Original line number	Diff line number	Diff line
		@@ -18,13 +18,10 @@ package com.android.internal.widget;

		import static org.junit.Assert.assertNotEquals;
		import static org.junit.Assert.assertTrue;
		import static org.testng.Assert.assertThrows;

		import android.content.Context;
		import android.os.UserHandle;

		import androidx.test.filters.SmallTest;
		import androidx.test.platform.app.InstrumentationRegistry;
		import androidx.test.runner.AndroidJUnit4;

		import org.junit.Test;
		@@ -34,9 +31,6 @@ import org.junit.runner.RunWith;
		@SmallTest
		public class LockPatternUtilsTest {

		private static final int INVALID_USER_ID = -1;
		private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();

		@Test
		public void testUserFrp_isNotRegularUser() throws Exception {
		assertTrue(LockPatternUtils.USER_FRP < 0);
		@@ -49,10 +43,4 @@ public class LockPatternUtilsTest {
		assertNotEquals(UserHandle.USER_CURRENT, LockPatternUtils.USER_FRP);
		assertNotEquals(UserHandle.USER_CURRENT_OR_SELF, LockPatternUtils.USER_FRP);
		}

		@Test
		public void getCredentialTypeForUser_invalidUserId_throwsIllegalArgumentException() {
		assertThrows(IllegalArgumentException.class,
		() -> new LockPatternUtils(mContext).getCredentialTypeForUser(INVALID_USER_ID));
		}
		}