diff options
| author | Michal Karpinski <mkarpinski@google.com> | 2018-01-24 15:40:09 +0000 |
|---|---|---|
| committer | Michal Karpinski <mkarpinski@google.com> | 2018-01-24 15:42:15 +0000 |
| commit | 6fe6c8ef02df1c394cab1316248e1ffb88c598a1 (patch) | |
| tree | b5514a6b8c668ba80a7e427f9d11225df1132f52 /core/java/android | |
| parent | 32f891dae34a123a0ae444a291262332040c7754 (diff) | |
Use proper logic operators in package name validation
And add unit tests for common validators as atonement...
Test: atest frameworks/base/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java
Bug: 64988620
Change-Id: I561319356cbca70da326586c2a762293c4ade9ed
Diffstat (limited to 'core/java/android')
| -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; } |