commit efc0b35fbd256bb3e225f4a1b953d0895ee3e99a
author Hans Boehm <hboehm@google.com> Tue Aug 19 22:15:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 16 04:28:29 2014 +0000
tree d3a2ee9f39a35f325b1273bd8625199d4f5d48a0
parent 703b60ce39e52d319074adf53704d33f9c16dbbd
parent 1ddaadb59883df5ca821b4b08fdd41a1720a3b6f

Merge "Fix CAS argument type."

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index f70ce1c..a441370 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -744,7 +744,7 @@
         sprintf(dex2oat_Xmx_arg, "-Xmx%s", dex2oat_Xmx_flag);
     }
     if (skip_compilation) {
-        strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=interpret-only");
+        strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=verify-none");
         have_dex2oat_compiler_filter_flag = true;
     } else if (have_dex2oat_compiler_filter_flag) {
         sprintf(dex2oat_compiler_filter_arg, "--compiler-filter=%s", dex2oat_compiler_filter_flag);

libs/binder/IPCThreadState.cpp

diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 57c4638..ae8f648 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -682,7 +682,7 @@
 
 IPCThreadState::IPCThreadState()
     : mProcess(ProcessState::self()),
-      mMyThreadId(androidGetTid()),
+      mMyThreadId(gettid()),
       mStrictModePolicy(0),
       mLastTransactionBinderFlags(0)
 {