diff options
| author | 2015-03-17 20:41:04 +0000 | |
|---|---|---|
| committer | 2015-03-17 20:41:04 +0000 | |
| commit | c8484abbbde02171023f159491ca342186ae095c (patch) | |
| tree | 7ad5187f36e2770e9647f8304714f185a5fbff90 | |
| parent | 17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a (diff) | |
| parent | 0ae488e1cb64318906397a40d8be4866e81e4860 (diff) | |
am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
Frameworks/base: Use || instead of |
| -rw-r--r-- | core/java/android/util/PathParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java index 92b19be64803..18dc26279f6c 100644 --- a/core/java/android/util/PathParser.java +++ b/core/java/android/util/PathParser.java @@ -164,7 +164,7 @@ public class PathParser { * @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 { |