summaryrefslogtreecommitdiff
path: root/core/java/android/view/LayoutInflater.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-01-31 20:35:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-01-31 20:35:54 +0000
commit9853d60bd96a032f07b7bd7ec145e255e1b7de40 (patch)
tree14d8f31a0c3fb4e1c9f90b61580d9a4cf3b0c4ea /core/java/android/view/LayoutInflater.java
parent4a49d7ad9615aa8d6ca85e4c98c1be9f621b726e (diff)
parentfa9df0b5db38e95998ab28bd3ea2165b1cf3b1b9 (diff)
Merge "Rename preferCodeIntegrity to useEmbeddedDex"
Diffstat (limited to 'core/java/android/view/LayoutInflater.java')
-rw-r--r--core/java/android/view/LayoutInflater.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java
index 6061cb2963eb..6a290b7fe045 100644
--- a/core/java/android/view/LayoutInflater.java
+++ b/core/java/android/view/LayoutInflater.java
@@ -414,8 +414,7 @@ public abstract class LayoutInflater {
// Make sure the application allows code generation
ApplicationInfo appInfo = mContext.getApplicationInfo();
- if ((appInfo.privateFlags & ApplicationInfo.PRIVATE_FLAG_PREFER_CODE_INTEGRITY) != 0
- || appInfo.isPrivilegedApp()) {
+ if (appInfo.isEmbeddedDexUsed() || appInfo.isPrivilegedApp()) {
mUseCompiledView = false;
return;
}