diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-17 20:47:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-17 20:47:41 +0000 |
| commit | 0fdfe72088f1c89380de18a6269c060a800e6e15 (patch) | |
| tree | 56581b564de1d117c8bb093ffaac3f4d734e2d6c /core/java/android/util | |
| parent | d75a3b4d2cf0bf743cfc5fc6d908ea7e8a8fafd0 (diff) | |
| parent | c8484abbbde02171023f159491ca342186ae095c (diff) | |
| download | frameworks_base-0fdfe72088f1c89380de18a6269c060a800e6e15.zip frameworks_base-0fdfe72088f1c89380de18a6269c060a800e6e15.tar.gz frameworks_base-0fdfe72088f1c89380de18a6269c060a800e6e15.tar.bz2 | |
am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit 'c8484abbbde02171023f159491ca342186ae095c':
Frameworks/base: Use || instead of |
Diffstat (limited to 'core/java/android/util')
| -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 92b19be..18dc262 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 { |