summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-03-15 20:32:22 -0700
committerAndreas Gampe <agampe@google.com>2015-03-17 20:27:42 +0000
commite1b9262084362c2001b421d6ed2b2e14083870ef (patch)
tree5b987a29ba0f3a0b2f49ce2e58d13b3c51ffe6a2 /core/java/android/util
parent30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9 (diff)
downloadframeworks_base-e1b9262084362c2001b421d6ed2b2e14083870ef.zip
frameworks_base-e1b9262084362c2001b421d6ed2b2e14083870ef.tar.gz
frameworks_base-e1b9262084362c2001b421d6ed2b2e14083870ef.tar.bz2
Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical. Bug: 19797138 Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
Diffstat (limited to 'core/java/android/util')
-rw-r--r--core/java/android/util/PathParser.java2
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 {