commit 12a10f6d1b4f33f17d86a79beca3bd852d21fdc9
author Brian Carlstrom <bdc@google.com> Fri May 23 15:19:36 2014 -0700
committer Brian Carlstrom <bdc@google.com> Fri May 23 17:42:15 2014 -0700
tree aaf7865aa45bd43ddff5232980d5bc7f74f6bd17
parent d84fba896f2779052b792f3203dbf77e355a25d3

Workaround issue with android.hardware

Probably bug exposed by frameworks/base:
   Move more packages to framework2
   22aea11d943f14f7f344f14c145be1d7daada69d

Bug: 15162069
Bug: 15162575
Change-Id: Ic797d27df6f3c336cf3480c06f1f0b5cc8973a3b

compiler/dex/frontend.cc

diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index 5ceda40..5e1198c 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -853,6 +853,11 @@
     }
   }
 
+  if (PrettyMethod(method_idx, dex_file).find("android.hardware") != std::string::npos) {
+    LOG(WARNING) << "b/15162069 b/15162575 Workaround inlining issue with " << PrettyMethod(method_idx, dex_file);
+    return nullptr;
+  }
+
   if (cu.verbose) {
     cu.enable_debug |= (1 << kDebugCodegenDump);
   }