From 1ba0b8ac2bffae0406427fe7a09e1526e190ee2a Mon Sep 17 00:00:00 2001
From: Shubham Ajmera <shubhamajmera@google.com>
Date: Tue, 19 Sep 2017 14:07:05 -0700
Subject: [PATCH] Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d

We have already reverted A/B dexopt for secondary dex files in commit
7c1471197427b59f99578fd2483b1e113ba4b7f1. This removes secondary dex
opt during boot after OTA.

Bug: 65067046
Test: make and boot.
Change-Id: I76009ed609a608e009a50860b53a8dfed9d57334
---
 .../android/server/pm/PackageManagerService.java    | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index f594b38c8f175..c387cdf01ae25 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -9803,19 +9803,6 @@ public class PackageManagerService extends IPackageManager.Stub
                     compilerFilter,
                     dexoptFlags));
 
-            if (pkg.isSystemApp()) {
-                // Only dexopt shared secondary dex files belonging to system apps to not slow down
-                // too much boot after an OTA.
-                int secondaryDexoptFlags = dexoptFlags |
-                        DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX |
-                        DexoptOptions.DEXOPT_ONLY_SHARED_DEX;
-                mDexManager.dexoptSecondaryDex(new DexoptOptions(
-                        pkg.packageName,
-                        compilerFilter,
-                        secondaryDexoptFlags));
-            }
-
-            // TODO(shubhamajmera): Record secondary dexopt stats.
             switch (primaryDexOptStaus) {
                 case PackageDexOptimizer.DEX_OPT_PERFORMED:
                     numberOfPackagesOptimized++;