summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-17 22:38:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-17 22:38:55 +0000
commit1615731d18b042d4c69dad3169166cce7a2a9fcf (patch)
tree01df673b57da9e8c62110113d3ca7357015fcd6a
parent753eda5b39882716a3eafc2162cedd89051ea06a (diff)
parent3b1e22e2898e27fe486ac4137692e0f20166e13e (diff)
downloadframeworks_base-1615731d18b042d4c69dad3169166cce7a2a9fcf.zip
frameworks_base-1615731d18b042d4c69dad3169166cce7a2a9fcf.tar.gz
frameworks_base-1615731d18b042d4c69dad3169166cce7a2a9fcf.tar.bz2
Merge "Fix check for PROC_QUOTES mode"
-rw-r--r--core/jni/android_util_Process.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 839a883..41fa681 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -719,7 +719,7 @@ jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz,
jint mode = formatData[fi];
if ((mode&PROC_PARENS) != 0) {
i++;
- } else if ((mode&PROC_QUOTES != 0)) {
+ } else if ((mode&PROC_QUOTES) != 0) {
if (buffer[i] == '"') {
i++;
} else {