diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-24 18:38:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-24 18:38:44 +0000 |
| commit | 18ef0d5beff86fabf27abb7b565d401924b3209f (patch) | |
| tree | 05a3b76cc35011c3e63d02069a64740090a8f764 /core/java | |
| parent | e53c1a1b6bb37e9356121d5d3a6e979c125432ff (diff) | |
| parent | 6fe6c8ef02df1c394cab1316248e1ffb88c598a1 (diff) | |
Merge "Use proper logic operators in package name validation"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/SettingsValidators.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/SettingsValidators.java b/core/java/android/provider/SettingsValidators.java index 84c9e8867c44..5885b6b50abd 100644 --- a/core/java/android/provider/SettingsValidators.java +++ b/core/java/android/provider/SettingsValidators.java @@ -100,7 +100,7 @@ public class SettingsValidators { String[] subparts = value.split("\\."); boolean isValidPackageName = true; for (String subpart : subparts) { - isValidPackageName |= isSubpartValidForPackageName(subpart); + isValidPackageName &= isSubpartValidForPackageName(subpart); if (!isValidPackageName) break; } return isValidPackageName; @@ -110,7 +110,7 @@ public class SettingsValidators { if (subpart.length() == 0) return false; boolean isValidSubpart = Character.isLetter(subpart.charAt(0)); for (int i = 1; i < subpart.length(); i++) { - isValidSubpart |= (Character.isLetterOrDigit(subpart.charAt(i)) + isValidSubpart &= (Character.isLetterOrDigit(subpart.charAt(i)) || (subpart.charAt(i) == '_')); if (!isValidSubpart) break; } |