Merge "Fix NPE in ComponentNameValidator" into pi-dev (c9fd5be4) · Commits · e / os / android_frameworks_base

core/java/android/provider/SettingsValidators.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ public class SettingsValidators {
		public static final Validator COMPONENT_NAME_VALIDATOR = new Validator() {
		@Override
		public boolean validate(String value) {
		return ComponentName.unflattenFromString(value) != null;
		return value != null && ComponentName.unflattenFromString(value) != null;
		}
		};

+6 −1

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		package android.provider;

		import static org.junit.Assert.fail;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		import static org.junit.Assert.fail;

		import android.platform.test.annotations.Presubmit;
		import android.provider.SettingsValidators.Validator;
		@@ -62,6 +62,11 @@ public class SettingsValidatorsTest {
		assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate("rectangle"));
		}

		@Test
		public void testComponentNameValidator_onNullValue_doesNotThrow() {
		assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate(null));
		}

		@Test
		public void testLocaleValidator() {
		assertTrue(SettingsValidators.LOCALE_VALIDATOR.validate("en_US"));