Merge "Frameworks/base: Use || instead of |"

2015-03-17 20:28:52 +00:00
parent 4d9076437c e1b9262084
commit 0ae488e1cb
1 changed files with 1 additions and 1 deletions
--- 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 {