diff options
| author | Annie Meng <anniemeng@google.com> | 2018-05-17 11:34:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-17 11:34:33 -0700 |
| commit | c9fd5be45f60a416347bf2ab044b435967c01255 (patch) | |
| tree | 1b2ca05d64d99800c16b53fe2577ce4415ce5eb0 /core/java | |
| parent | f08646f13e6ce463011dbaa8e574ad4d3bd993c5 (diff) | |
| parent | b1059130980a8244ec091749babf006b4a5bcce6 (diff) | |
Merge "Fix NPE in ComponentNameValidator" into pi-dev
am: b105913098
Change-Id: I9725217151634a66d7cd3dc0e80acb5f78f15c39
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/SettingsValidators.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/SettingsValidators.java b/core/java/android/provider/SettingsValidators.java index 5885b6b50abd..c878bba4edfe 100644 --- 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; } }; |