Merge "Fix NPE in ComponentNameValidator" into pi-dev

am: b105913098 Change-Id: I9725217151634a66d7cd3dc0e80acb5f78f15c39
2018-05-17 11:34:33 -07:00
parent f08646f13e b105913098
commit c9fd5be45f
2 changed files with 7 additions and 2 deletions
--- a/core/java/android/provider/SettingsValidators.java
+++ b/core/java/android/provider/SettingsValidators.java
@@ -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;
        }
    };