commit 60e97a4bd482a0b096135099e3ac179d8676ede0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 07 06:08:13 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 07 06:08:13 2016 +0000
tree cdc9ed7b6b869dd952734e8499c6210e1365f12b
parent 59ac10df3a9d285112574324002cd7dcd2b1ae0b
parent 18f908b394253ae01d6c75a1e5d7376733077798

Merge "Revert "Don't use profiles with vm safe mode""

cmds/installd/commands.cpp

diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index c35a4fd..95451bf 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -1551,9 +1551,6 @@
     bool boot_complete = (dexopt_flags & DEXOPT_BOOTCOMPLETE) != 0;
     bool profile_guided = (dexopt_flags & DEXOPT_PROFILE_GUIDED) != 0;
 
-    // Don't use profile for vm_safe_mode. b/30688277
-    profile_guided = profile_guided && !vm_safe_mode;
-
     CHECK(pkgname != nullptr);
     CHECK(pkgname[0] != 0);