commit | 0ae488e1cb64318906397a40d8be4866e81e4860 | [log] [tgz] |
---|---|---|
author | Andreas Gampe <agampe@google.com> | Tue Mar 17 20:28:52 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 17 20:28:53 2015 +0000 |
tree | 2e3eb3aec975732ffe3715eb01378c0b422a1ed4 | |
parent | 4d9076437c0270cd863493f505e734a3108e89ea [diff] | |
parent | e1b9262084362c2001b421d6ed2b2e14083870ef [diff] |
Merge "Frameworks/base: Use || instead of |"
diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java index 92b19be..18dc262 100644 --- a/core/java/android/util/PathParser.java +++ b/core/java/android/util/PathParser.java
@@ -164,7 +164,7 @@ * @return array of floats */ private static float[] getFloats(String s) { - if (s.charAt(0) == 'z' | s.charAt(0) == 'Z') { + if (s.charAt(0) == 'z' || s.charAt(0) == 'Z') { return new float[0]; } try {