Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2015 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License |
| 15 | */ |
| 16 | |
| 17 | package com.android.server.pm; |
| 18 | |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 19 | import android.annotation.Nullable; |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 20 | import android.content.Context; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 21 | import android.content.pm.ApplicationInfo; |
| 22 | import android.content.pm.PackageParser; |
Calin Juravle | adbadd5 | 2017-03-28 18:19:15 -0700 | [diff] [blame] | 23 | import android.os.FileUtils; |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 24 | import android.os.PowerManager; |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 25 | import android.os.SystemClock; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 26 | import android.os.UserHandle; |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 27 | import android.os.WorkSource; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 28 | import android.util.Log; |
| 29 | import android.util.Slog; |
| 30 | |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 31 | import com.android.internal.annotations.GuardedBy; |
Narayan Kamath | 88eea9e | 2016-05-02 14:44:31 +0100 | [diff] [blame] | 32 | import com.android.internal.util.IndentingPrintWriter; |
Jeff Sharkey | 740f523 | 2016-12-09 14:31:26 -0700 | [diff] [blame] | 33 | import com.android.server.pm.Installer.InstallerException; |
Calin Juravle | 1d0e83d | 2017-07-17 15:12:01 -0700 | [diff] [blame] | 34 | import com.android.server.pm.dex.DexoptOptions; |
Calin Juravle | 19da1cf | 2017-07-12 18:52:49 -0700 | [diff] [blame] | 35 | import com.android.server.pm.dex.DexoptUtils; |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 36 | import com.android.server.pm.dex.PackageDexUsage; |
Jeff Sharkey | fdeeeea | 2016-01-11 17:34:24 -0700 | [diff] [blame] | 37 | |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 38 | import java.io.File; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 39 | import java.io.IOException; |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 40 | import java.util.ArrayList; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 41 | import java.util.List; |
| 42 | |
| 43 | import dalvik.system.DexFile; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 44 | |
Todd Kennedy | fa54ab7 | 2015-09-25 07:46:12 -0700 | [diff] [blame] | 45 | import static com.android.server.pm.Installer.DEXOPT_BOOTCOMPLETE; |
| 46 | import static com.android.server.pm.Installer.DEXOPT_DEBUGGABLE; |
Andreas Gampe | bdd30d8 | 2016-03-20 11:32:11 -0700 | [diff] [blame] | 47 | import static com.android.server.pm.Installer.DEXOPT_PROFILE_GUIDED; |
Todd Kennedy | fa54ab7 | 2015-09-25 07:46:12 -0700 | [diff] [blame] | 48 | import static com.android.server.pm.Installer.DEXOPT_PUBLIC; |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 49 | import static com.android.server.pm.Installer.DEXOPT_SECONDARY_DEX; |
| 50 | import static com.android.server.pm.Installer.DEXOPT_FORCE; |
| 51 | import static com.android.server.pm.Installer.DEXOPT_STORAGE_CE; |
| 52 | import static com.android.server.pm.Installer.DEXOPT_STORAGE_DE; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 53 | import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; |
| 54 | import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 55 | |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 56 | import static com.android.server.pm.PackageManagerService.WATCHDOG_TIMEOUT; |
Nicolas Geoffray | b0818e8 | 2017-05-05 10:23:19 +0100 | [diff] [blame] | 57 | |
Nicolas Geoffray | d093b20 | 2017-05-03 13:11:58 +0100 | [diff] [blame] | 58 | import static dalvik.system.DexFile.getNonProfileGuidedCompilerFilter; |
| 59 | import static dalvik.system.DexFile.getSafeModeCompilerFilter; |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 60 | import static dalvik.system.DexFile.isProfileGuidedCompilerFilter; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 61 | |
| 62 | /** |
| 63 | * Helper class for running dexopt command on packages. |
| 64 | */ |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 65 | public class PackageDexOptimizer { |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 66 | private static final String TAG = "PackageManager.DexOptimizer"; |
| 67 | static final String OAT_DIR_NAME = "oat"; |
| 68 | // TODO b/19550105 Remove error codes and use exceptions |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 69 | public static final int DEX_OPT_SKIPPED = 0; |
| 70 | public static final int DEX_OPT_PERFORMED = 1; |
| 71 | public static final int DEX_OPT_FAILED = -1; |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 72 | // One minute over PM WATCHDOG_TIMEOUT |
| 73 | private static final long WAKELOCK_TIMEOUT_MS = WATCHDOG_TIMEOUT + 1000 * 60; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 74 | |
Calin Juravle | aae3576 | 2017-02-14 17:53:13 -0800 | [diff] [blame] | 75 | /** Special library name that skips shared libraries check during compilation. */ |
| 76 | public static final String SKIP_SHARED_LIBRARY_CHECK = "&"; |
| 77 | |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 78 | @GuardedBy("mInstallLock") |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 79 | private final Installer mInstaller; |
| 80 | private final Object mInstallLock; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 81 | |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 82 | @GuardedBy("mInstallLock") |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 83 | private final PowerManager.WakeLock mDexoptWakeLock; |
| 84 | private volatile boolean mSystemReady; |
| 85 | |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 86 | PackageDexOptimizer(Installer installer, Object installLock, Context context, |
| 87 | String wakeLockTag) { |
| 88 | this.mInstaller = installer; |
| 89 | this.mInstallLock = installLock; |
| 90 | |
| 91 | PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE); |
| 92 | mDexoptWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, wakeLockTag); |
| 93 | } |
| 94 | |
| 95 | protected PackageDexOptimizer(PackageDexOptimizer from) { |
| 96 | this.mInstaller = from.mInstaller; |
| 97 | this.mInstallLock = from.mInstallLock; |
| 98 | this.mDexoptWakeLock = from.mDexoptWakeLock; |
| 99 | this.mSystemReady = from.mSystemReady; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 100 | } |
| 101 | |
Calin Juravle | db4a79a | 2015-12-23 18:55:08 +0200 | [diff] [blame] | 102 | static boolean canOptimizePackage(PackageParser.Package pkg) { |
Calin Juravle | 6dfd83d | 2016-01-29 18:23:57 +0000 | [diff] [blame] | 103 | return (pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0; |
Calin Juravle | db4a79a | 2015-12-23 18:55:08 +0200 | [diff] [blame] | 104 | } |
| 105 | |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 106 | /** |
| 107 | * Performs dexopt on all code paths and libraries of the specified package for specified |
| 108 | * instruction sets. |
| 109 | * |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 110 | * <p>Calls to {@link com.android.server.pm.Installer#dexopt} on {@link #mInstaller} are |
| 111 | * synchronized on {@link #mInstallLock}. |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 112 | */ |
Jeff Hao | c7b9482 | 2016-03-16 15:56:07 -0700 | [diff] [blame] | 113 | int performDexOpt(PackageParser.Package pkg, String[] sharedLibraries, |
Calin Juravle | 1d0e83d | 2017-07-17 15:12:01 -0700 | [diff] [blame] | 114 | String[] instructionSets, CompilerStats.PackageStats packageStats, |
| 115 | boolean isUsedByOtherApps, DexoptOptions options) { |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 116 | if (!canOptimizePackage(pkg)) { |
| 117 | return DEX_OPT_SKIPPED; |
| 118 | } |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 119 | synchronized (mInstallLock) { |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 120 | final long acquireTime = acquireWakeLockLI(pkg.applicationInfo.uid); |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 121 | try { |
Calin Juravle | 1d0e83d | 2017-07-17 15:12:01 -0700 | [diff] [blame] | 122 | return performDexOptLI(pkg, sharedLibraries, instructionSets, |
| 123 | packageStats, isUsedByOtherApps, options); |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 124 | } finally { |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 125 | releaseWakeLockLI(acquireTime); |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 126 | } |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 127 | } |
| 128 | } |
| 129 | |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 130 | /** |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 131 | * Performs dexopt on all code paths of the given package. |
| 132 | * It assumes the install lock is held. |
| 133 | */ |
| 134 | @GuardedBy("mInstallLock") |
| 135 | private int performDexOptLI(PackageParser.Package pkg, String[] sharedLibraries, |
Calin Juravle | 1d0e83d | 2017-07-17 15:12:01 -0700 | [diff] [blame] | 136 | String[] targetInstructionSets, CompilerStats.PackageStats packageStats, |
| 137 | boolean isUsedByOtherApps, DexoptOptions options) { |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 138 | final String[] instructionSets = targetInstructionSets != null ? |
| 139 | targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo); |
| 140 | final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets); |
Jeff Hao | 5def5e5 | 2017-04-19 14:42:16 -0700 | [diff] [blame] | 141 | final List<String> paths = pkg.getAllCodePaths(); |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 142 | final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid); |
| 143 | |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 144 | final String compilerFilter = getRealCompilerFilter(pkg.applicationInfo, |
Calin Juravle | 1d0e83d | 2017-07-17 15:12:01 -0700 | [diff] [blame] | 145 | options.getCompilerFilter(), isUsedByOtherApps); |
| 146 | final boolean profileUpdated = options.isCheckForProfileUpdates() && |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 147 | isProfileUpdated(pkg, sharedGid, compilerFilter); |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 148 | |
Calin Juravle | efb1c94 | 2017-04-04 20:31:44 -0700 | [diff] [blame] | 149 | // Get the dexopt flags after getRealCompilerFilter to make sure we get the correct flags. |
Calin Juravle | 1d0e83d | 2017-07-17 15:12:01 -0700 | [diff] [blame] | 150 | final int dexoptFlags = getDexFlags(pkg, compilerFilter, options.isBootComplete()); |
Calin Juravle | 19da1cf | 2017-07-12 18:52:49 -0700 | [diff] [blame] | 151 | |
| 152 | // Get the class loader context dependencies. |
| 153 | // For each code path in the package, this array contains the class loader context that |
| 154 | // needs to be passed to dexopt in order to ensure correct optimizations. |
| 155 | String[] classLoaderContexts = DexoptUtils.getClassLoaderContexts( |
| 156 | pkg.applicationInfo, sharedLibraries); |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 157 | |
| 158 | int result = DEX_OPT_SKIPPED; |
Jeff Hao | 5def5e5 | 2017-04-19 14:42:16 -0700 | [diff] [blame] | 159 | for (int i = 0; i < paths.size(); i++) { |
| 160 | // Skip paths that have no code. |
| 161 | if ((i == 0 && (pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) == 0) || |
| 162 | (i != 0 && (pkg.splitFlags[i - 1] & ApplicationInfo.FLAG_HAS_CODE) == 0)) { |
| 163 | continue; |
| 164 | } |
| 165 | // Append shared libraries with split dependencies for this split. |
| 166 | String path = paths.get(i); |
Calin Juravle | b6f844d | 2017-07-17 15:23:21 -0700 | [diff] [blame] | 167 | if (options.getSplitName() != null) { |
| 168 | // We are asked to compile only a specific split. Check that the current path is |
| 169 | // what we are looking for. |
| 170 | if (!options.getSplitName().equals(new File(path).getName())) { |
| 171 | continue; |
| 172 | } |
| 173 | } |
| 174 | |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 175 | for (String dexCodeIsa : dexCodeInstructionSets) { |
Calin Juravle | 19da1cf | 2017-07-12 18:52:49 -0700 | [diff] [blame] | 176 | int newResult = dexOptPath(pkg, path, dexCodeIsa, compilerFilter, |
| 177 | profileUpdated, classLoaderContexts[i], dexoptFlags, sharedGid, |
| 178 | packageStats, options.isDowngrade()); |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 179 | // The end result is: |
| 180 | // - FAILED if any path failed, |
| 181 | // - PERFORMED if at least one path needed compilation, |
| 182 | // - SKIPPED when all paths are up to date |
| 183 | if ((result != DEX_OPT_FAILED) && (newResult != DEX_OPT_SKIPPED)) { |
| 184 | result = newResult; |
| 185 | } |
| 186 | } |
| 187 | } |
| 188 | return result; |
| 189 | } |
| 190 | |
| 191 | /** |
| 192 | * Performs dexopt on the {@code path} belonging to the package {@code pkg}. |
| 193 | * |
| 194 | * @return |
| 195 | * DEX_OPT_FAILED if there was any exception during dexopt |
| 196 | * DEX_OPT_PERFORMED if dexopt was performed successfully on the given path. |
| 197 | * DEX_OPT_SKIPPED if the path does not need to be deopt-ed. |
| 198 | */ |
| 199 | @GuardedBy("mInstallLock") |
| 200 | private int dexOptPath(PackageParser.Package pkg, String path, String isa, |
| 201 | String compilerFilter, boolean profileUpdated, String sharedLibrariesPath, |
Shubham Ajmera | 246dccf | 2017-05-24 17:46:36 -0700 | [diff] [blame] | 202 | int dexoptFlags, int uid, CompilerStats.PackageStats packageStats, boolean downgrade) { |
| 203 | int dexoptNeeded = getDexoptNeeded(path, isa, compilerFilter, profileUpdated, downgrade); |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 204 | if (Math.abs(dexoptNeeded) == DexFile.NO_DEXOPT_NEEDED) { |
| 205 | return DEX_OPT_SKIPPED; |
| 206 | } |
| 207 | |
| 208 | // TODO(calin): there's no need to try to create the oat dir over and over again, |
| 209 | // especially since it involve an extra installd call. We should create |
| 210 | // if (if supported) on the fly during the dexopt call. |
| 211 | String oatDir = createOatDirIfSupported(pkg, isa); |
| 212 | |
| 213 | Log.i(TAG, "Running dexopt (dexoptNeeded=" + dexoptNeeded + ") on: " + path |
| 214 | + " pkg=" + pkg.applicationInfo.packageName + " isa=" + isa |
| 215 | + " dexoptFlags=" + printDexoptFlags(dexoptFlags) |
| 216 | + " target-filter=" + compilerFilter + " oatDir=" + oatDir |
| 217 | + " sharedLibraries=" + sharedLibrariesPath); |
| 218 | |
| 219 | try { |
| 220 | long startTime = System.currentTimeMillis(); |
| 221 | |
Shubham Ajmera | 246dccf | 2017-05-24 17:46:36 -0700 | [diff] [blame] | 222 | // TODO: Consider adding 2 different APIs for primary and secondary dexopt. |
| 223 | // installd only uses downgrade flag for secondary dex files and ignores it for |
| 224 | // primary dex files. |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 225 | mInstaller.dexopt(path, uid, pkg.packageName, isa, dexoptNeeded, oatDir, dexoptFlags, |
Shubham Ajmera | 246dccf | 2017-05-24 17:46:36 -0700 | [diff] [blame] | 226 | compilerFilter, pkg.volumeUuid, sharedLibrariesPath, pkg.applicationInfo.seInfo, |
| 227 | false /* downgrade*/); |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 228 | |
| 229 | if (packageStats != null) { |
| 230 | long endTime = System.currentTimeMillis(); |
| 231 | packageStats.setCompileTime(path, (int)(endTime - startTime)); |
| 232 | } |
| 233 | return DEX_OPT_PERFORMED; |
| 234 | } catch (InstallerException e) { |
| 235 | Slog.w(TAG, "Failed to dexopt", e); |
| 236 | return DEX_OPT_FAILED; |
| 237 | } |
| 238 | } |
| 239 | |
| 240 | /** |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 241 | * Performs dexopt on the secondary dex {@code path} belonging to the app {@code info}. |
| 242 | * |
| 243 | * @return |
| 244 | * DEX_OPT_FAILED if there was any exception during dexopt |
| 245 | * DEX_OPT_PERFORMED if dexopt was performed successfully on the given path. |
| 246 | * NOTE that DEX_OPT_PERFORMED for secondary dex files includes the case when the dex file |
| 247 | * didn't need an update. That's because at the moment we don't get more than success/failure |
| 248 | * from installd. |
| 249 | * |
| 250 | * TODO(calin): Consider adding return codes to installd dexopt invocation (rather than |
| 251 | * throwing exceptions). Or maybe make a separate call to installd to get DexOptNeeded, though |
| 252 | * that seems wasteful. |
| 253 | */ |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 254 | public int dexOptSecondaryDexPath(ApplicationInfo info, String path, |
| 255 | PackageDexUsage.DexUseInfo dexUseInfo, DexoptOptions options) { |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 256 | synchronized (mInstallLock) { |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 257 | final long acquireTime = acquireWakeLockLI(info.uid); |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 258 | try { |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 259 | return dexOptSecondaryDexPathLI(info, path, dexUseInfo, options); |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 260 | } finally { |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 261 | releaseWakeLockLI(acquireTime); |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 262 | } |
| 263 | } |
| 264 | } |
| 265 | |
| 266 | @GuardedBy("mInstallLock") |
Fyodor Kupolov | 28f2855 | 2017-05-02 12:11:02 -0700 | [diff] [blame] | 267 | private long acquireWakeLockLI(final int uid) { |
| 268 | // During boot the system doesn't need to instantiate and obtain a wake lock. |
| 269 | // PowerManager might not be ready, but that doesn't mean that we can't proceed with |
| 270 | // dexopt. |
| 271 | if (!mSystemReady) { |
| 272 | return -1; |
| 273 | } |
| 274 | mDexoptWakeLock.setWorkSource(new WorkSource(uid)); |
| 275 | mDexoptWakeLock.acquire(WAKELOCK_TIMEOUT_MS); |
| 276 | return SystemClock.elapsedRealtime(); |
| 277 | } |
| 278 | |
| 279 | @GuardedBy("mInstallLock") |
| 280 | private void releaseWakeLockLI(final long acquireTime) { |
| 281 | if (acquireTime < 0) { |
| 282 | return; |
| 283 | } |
| 284 | try { |
| 285 | if (mDexoptWakeLock.isHeld()) { |
| 286 | mDexoptWakeLock.release(); |
| 287 | } |
| 288 | final long duration = SystemClock.elapsedRealtime() - acquireTime; |
| 289 | if (duration >= WAKELOCK_TIMEOUT_MS) { |
| 290 | Slog.wtf(TAG, "WakeLock " + mDexoptWakeLock.getTag() |
| 291 | + " time out. Operation took " + duration + " ms. Thread: " |
| 292 | + Thread.currentThread().getName()); |
| 293 | } |
| 294 | } catch (Exception e) { |
| 295 | Slog.wtf(TAG, "Error while releasing " + mDexoptWakeLock.getTag() + " lock", e); |
| 296 | } |
| 297 | } |
| 298 | |
| 299 | @GuardedBy("mInstallLock") |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 300 | private int dexOptSecondaryDexPathLI(ApplicationInfo info, String path, |
| 301 | PackageDexUsage.DexUseInfo dexUseInfo, DexoptOptions options) { |
| 302 | if (options.isDexoptOnlySharedDex() && !dexUseInfo.isUsedByOtherApps()) { |
| 303 | // We are asked to optimize only the dex files used by other apps and this is not |
| 304 | // on of them: skip it. |
| 305 | return DEX_OPT_SKIPPED; |
| 306 | } |
| 307 | |
| 308 | String compilerFilter = getRealCompilerFilter(info, options.getCompilerFilter(), |
| 309 | dexUseInfo.isUsedByOtherApps()); |
Calin Juravle | efb1c94 | 2017-04-04 20:31:44 -0700 | [diff] [blame] | 310 | // Get the dexopt flags after getRealCompilerFilter to make sure we get the correct flags. |
Nicolas Geoffray | 3b4359a | 2017-05-25 13:53:22 +0100 | [diff] [blame] | 311 | // Secondary dex files are currently not compiled at boot. |
| 312 | int dexoptFlags = getDexFlags(info, compilerFilter, /* bootComplete */ true) |
| 313 | | DEXOPT_SECONDARY_DEX; |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 314 | // Check the app storage and add the appropriate flags. |
Calin Juravle | adbadd5 | 2017-03-28 18:19:15 -0700 | [diff] [blame] | 315 | if (info.deviceProtectedDataDir != null && |
| 316 | FileUtils.contains(info.deviceProtectedDataDir, path)) { |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 317 | dexoptFlags |= DEXOPT_STORAGE_DE; |
Calin Juravle | adbadd5 | 2017-03-28 18:19:15 -0700 | [diff] [blame] | 318 | } else if (info.credentialProtectedDataDir != null && |
| 319 | FileUtils.contains(info.credentialProtectedDataDir, path)) { |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 320 | dexoptFlags |= DEXOPT_STORAGE_CE; |
| 321 | } else { |
| 322 | Slog.e(TAG, "Could not infer CE/DE storage for package " + info.packageName); |
| 323 | return DEX_OPT_FAILED; |
| 324 | } |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 325 | Log.d(TAG, "Running dexopt on: " + path |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 326 | + " pkg=" + info.packageName + " isa=" + dexUseInfo.getLoaderIsas() |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 327 | + " dexoptFlags=" + printDexoptFlags(dexoptFlags) |
| 328 | + " target-filter=" + compilerFilter); |
| 329 | |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 330 | String classLoaderContext; |
| 331 | if (dexUseInfo.isUnknownClassLoaderContext() || |
| 332 | dexUseInfo.isUnsupportedClassLoaderContext() || |
| 333 | dexUseInfo.isVariableClassLoaderContext()) { |
| 334 | // If we have an unknown (not yet set), unsupported (custom class loaders), or a |
| 335 | // variable class loader chain, compile without a context and mark the oat file with |
| 336 | // SKIP_SHARED_LIBRARY_CHECK. Note that his might lead to a incorrect compilation. |
| 337 | // TODO(calin): We should just extract in this case. |
| 338 | classLoaderContext = SKIP_SHARED_LIBRARY_CHECK; |
| 339 | } else { |
| 340 | classLoaderContext = dexUseInfo.getClassLoaderContext(); |
| 341 | } |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 342 | try { |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 343 | for (String isa : dexUseInfo.getLoaderIsas()) { |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 344 | // Reuse the same dexopt path as for the primary apks. We don't need all the |
| 345 | // arguments as some (dexopNeeded and oatDir) will be computed by installd because |
| 346 | // system server cannot read untrusted app content. |
| 347 | // TODO(calin): maybe add a separate call. |
| 348 | mInstaller.dexopt(path, info.uid, info.packageName, isa, /*dexoptNeeded*/ 0, |
| 349 | /*oatDir*/ null, dexoptFlags, |
Calin Juravle | f1ff36f | 2017-07-22 12:33:41 -0700 | [diff] [blame] | 350 | compilerFilter, info.volumeUuid, classLoaderContext, info.seInfoUser, |
| 351 | options.isDowngrade()); |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 352 | } |
| 353 | |
| 354 | return DEX_OPT_PERFORMED; |
| 355 | } catch (InstallerException e) { |
| 356 | Slog.w(TAG, "Failed to dexopt", e); |
| 357 | return DEX_OPT_FAILED; |
| 358 | } |
| 359 | } |
| 360 | |
| 361 | /** |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 362 | * Adjust the given dexopt-needed value. Can be overridden to influence the decision to |
| 363 | * optimize or not (and in what way). |
| 364 | */ |
| 365 | protected int adjustDexoptNeeded(int dexoptNeeded) { |
| 366 | return dexoptNeeded; |
| 367 | } |
| 368 | |
| 369 | /** |
| 370 | * Adjust the given dexopt flags that will be passed to the installer. |
| 371 | */ |
| 372 | protected int adjustDexoptFlags(int dexoptFlags) { |
| 373 | return dexoptFlags; |
| 374 | } |
| 375 | |
Narayan Kamath | 88eea9e | 2016-05-02 14:44:31 +0100 | [diff] [blame] | 376 | /** |
| 377 | * Dumps the dexopt state of the given package {@code pkg} to the given {@code PrintWriter}. |
| 378 | */ |
| 379 | void dumpDexoptState(IndentingPrintWriter pw, PackageParser.Package pkg) { |
| 380 | final String[] instructionSets = getAppDexInstructionSets(pkg.applicationInfo); |
| 381 | final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets); |
| 382 | |
| 383 | final List<String> paths = pkg.getAllCodePathsExcludingResourceOnly(); |
| 384 | |
| 385 | for (String instructionSet : dexCodeInstructionSets) { |
| 386 | pw.println("Instruction Set: " + instructionSet); |
| 387 | pw.increaseIndent(); |
| 388 | for (String path : paths) { |
| 389 | String status = null; |
| 390 | try { |
| 391 | status = DexFile.getDexFileStatus(path, instructionSet); |
| 392 | } catch (IOException ioe) { |
| 393 | status = "[Exception]: " + ioe.getMessage(); |
| 394 | } |
| 395 | pw.println("path: " + path); |
| 396 | pw.println("status: " + status); |
| 397 | } |
| 398 | pw.decreaseIndent(); |
| 399 | } |
| 400 | } |
| 401 | |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 402 | /** |
| 403 | * Returns the compiler filter that should be used to optimize the package code. |
| 404 | * The target filter will be updated if the package code is used by other apps |
| 405 | * or if it has the safe mode flag set. |
| 406 | */ |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 407 | private String getRealCompilerFilter(ApplicationInfo info, String targetCompilerFilter, |
| 408 | boolean isUsedByOtherApps) { |
| 409 | int flags = info.flags; |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 410 | boolean vmSafeMode = (flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0; |
Mathieu Chartier | 41e4a37 | 2016-09-02 16:36:42 -0700 | [diff] [blame] | 411 | if (vmSafeMode) { |
Nicolas Geoffray | d093b20 | 2017-05-03 13:11:58 +0100 | [diff] [blame] | 412 | return getSafeModeCompilerFilter(targetCompilerFilter); |
Mathieu Chartier | 41e4a37 | 2016-09-02 16:36:42 -0700 | [diff] [blame] | 413 | } |
| 414 | |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 415 | if (isProfileGuidedCompilerFilter(targetCompilerFilter) && isUsedByOtherApps) { |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 416 | // If the dex files is used by other apps, we cannot use profile-guided compilation. |
| 417 | return getNonProfileGuidedCompilerFilter(targetCompilerFilter); |
Andreas Gampe | bdd30d8 | 2016-03-20 11:32:11 -0700 | [diff] [blame] | 418 | } |
| 419 | |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 420 | return targetCompilerFilter; |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 421 | } |
| 422 | |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 423 | /** |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 424 | * Computes the dex flags that needs to be pass to installd for the given package and compiler |
| 425 | * filter. |
| 426 | */ |
Nicolas Geoffray | 3b4359a | 2017-05-25 13:53:22 +0100 | [diff] [blame] | 427 | private int getDexFlags(PackageParser.Package pkg, String compilerFilter, |
| 428 | boolean bootComplete) { |
| 429 | return getDexFlags(pkg.applicationInfo, compilerFilter, bootComplete); |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 430 | } |
| 431 | |
Nicolas Geoffray | 3b4359a | 2017-05-25 13:53:22 +0100 | [diff] [blame] | 432 | private int getDexFlags(ApplicationInfo info, String compilerFilter, boolean bootComplete) { |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 433 | int flags = info.flags; |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 434 | boolean debuggable = (flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; |
| 435 | // Profile guide compiled oat files should not be public. |
| 436 | boolean isProfileGuidedFilter = isProfileGuidedCompilerFilter(compilerFilter); |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 437 | boolean isPublic = !info.isForwardLocked() && !isProfileGuidedFilter; |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 438 | int profileFlag = isProfileGuidedFilter ? DEXOPT_PROFILE_GUIDED : 0; |
| 439 | int dexFlags = |
| 440 | (isPublic ? DEXOPT_PUBLIC : 0) |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 441 | | (debuggable ? DEXOPT_DEBUGGABLE : 0) |
| 442 | | profileFlag |
Nicolas Geoffray | 3b4359a | 2017-05-25 13:53:22 +0100 | [diff] [blame] | 443 | | (bootComplete ? DEXOPT_BOOTCOMPLETE : 0); |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 444 | return adjustDexoptFlags(dexFlags); |
| 445 | } |
| 446 | |
| 447 | /** |
| 448 | * Assesses if there's a need to perform dexopt on {@code path} for the given |
| 449 | * configuration (isa, compiler filter, profile). |
| 450 | */ |
| 451 | private int getDexoptNeeded(String path, String isa, String compilerFilter, |
Shubham Ajmera | 246dccf | 2017-05-24 17:46:36 -0700 | [diff] [blame] | 452 | boolean newProfile, boolean downgrade) { |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 453 | int dexoptNeeded; |
| 454 | try { |
Shubham Ajmera | 246dccf | 2017-05-24 17:46:36 -0700 | [diff] [blame] | 455 | dexoptNeeded = DexFile.getDexOptNeeded(path, isa, compilerFilter, newProfile, |
| 456 | downgrade); |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 457 | } catch (IOException ioe) { |
| 458 | Slog.w(TAG, "IOException reading apk: " + path, ioe); |
| 459 | return DEX_OPT_FAILED; |
| 460 | } |
| 461 | return adjustDexoptNeeded(dexoptNeeded); |
| 462 | } |
| 463 | |
| 464 | /** |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 465 | * Checks if there is an update on the profile information of the {@code pkg}. |
| 466 | * If the compiler filter is not profile guided the method returns false. |
| 467 | * |
| 468 | * Note that this is a "destructive" operation with side effects. Under the hood the |
| 469 | * current profile and the reference profile will be merged and subsequent calls |
| 470 | * may return a different result. |
| 471 | */ |
| 472 | private boolean isProfileUpdated(PackageParser.Package pkg, int uid, String compilerFilter) { |
| 473 | // Check if we are allowed to merge and if the compiler filter is profile guided. |
| 474 | if (!isProfileGuidedCompilerFilter(compilerFilter)) { |
| 475 | return false; |
| 476 | } |
| 477 | // Merge profiles. It returns whether or not there was an updated in the profile info. |
| 478 | try { |
| 479 | return mInstaller.mergeProfiles(uid, pkg.packageName); |
| 480 | } catch (InstallerException e) { |
| 481 | Slog.w(TAG, "Failed to merge profiles", e); |
| 482 | } |
| 483 | return false; |
| 484 | } |
| 485 | |
| 486 | /** |
| 487 | * Creates oat dir for the specified package if needed and supported. |
| 488 | * In certain cases oat directory |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 489 | * <strong>cannot</strong> be created: |
| 490 | * <ul> |
| 491 | * <li>{@code pkg} is a system app, which is not updated.</li> |
| 492 | * <li>Package location is not a directory, i.e. monolithic install.</li> |
| 493 | * </ul> |
| 494 | * |
Richard Uhler | 7b08b35 | 2015-03-25 16:25:57 -0700 | [diff] [blame] | 495 | * @return Absolute path to the oat directory or null, if oat directory |
| 496 | * cannot be created. |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 497 | */ |
| 498 | @Nullable |
Todd Kennedy | 27c24fb | 2015-09-17 16:49:25 -0700 | [diff] [blame] | 499 | private String createOatDirIfSupported(PackageParser.Package pkg, String dexInstructionSet) { |
Fyodor Kupolov | ebcac16 | 2015-09-09 15:56:45 -0700 | [diff] [blame] | 500 | if (!pkg.canHaveOatDir()) { |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 501 | return null; |
| 502 | } |
| 503 | File codePath = new File(pkg.codePath); |
| 504 | if (codePath.isDirectory()) { |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 505 | // TODO(calin): why do we create this only if the codePath is a directory? (i.e for |
| 506 | // cluster packages). It seems that the logic for the folder creation is |
| 507 | // split between installd and here. |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 508 | File oatDir = getOatDir(codePath); |
Jeff Sharkey | fdeeeea | 2016-01-11 17:34:24 -0700 | [diff] [blame] | 509 | try { |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 510 | mInstaller.createOatDir(oatDir.getAbsolutePath(), dexInstructionSet); |
Jeff Sharkey | fdeeeea | 2016-01-11 17:34:24 -0700 | [diff] [blame] | 511 | } catch (InstallerException e) { |
| 512 | Slog.w(TAG, "Failed to create oat dir", e); |
| 513 | return null; |
| 514 | } |
Richard Uhler | 7b08b35 | 2015-03-25 16:25:57 -0700 | [diff] [blame] | 515 | return oatDir.getAbsolutePath(); |
Fyodor Kupolov | b94c165 | 2015-03-03 12:25:30 -0800 | [diff] [blame] | 516 | } |
| 517 | return null; |
| 518 | } |
| 519 | |
| 520 | static File getOatDir(File codePath) { |
| 521 | return new File(codePath, OAT_DIR_NAME); |
| 522 | } |
| 523 | |
Fyodor Kupolov | a627c09 | 2015-05-05 18:44:39 -0700 | [diff] [blame] | 524 | void systemReady() { |
| 525 | mSystemReady = true; |
| 526 | } |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 527 | |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 528 | private String printDexoptFlags(int flags) { |
| 529 | ArrayList<String> flagsList = new ArrayList<>(); |
| 530 | |
| 531 | if ((flags & DEXOPT_BOOTCOMPLETE) == DEXOPT_BOOTCOMPLETE) { |
| 532 | flagsList.add("boot_complete"); |
| 533 | } |
| 534 | if ((flags & DEXOPT_DEBUGGABLE) == DEXOPT_DEBUGGABLE) { |
| 535 | flagsList.add("debuggable"); |
| 536 | } |
| 537 | if ((flags & DEXOPT_PROFILE_GUIDED) == DEXOPT_PROFILE_GUIDED) { |
| 538 | flagsList.add("profile_guided"); |
| 539 | } |
| 540 | if ((flags & DEXOPT_PUBLIC) == DEXOPT_PUBLIC) { |
| 541 | flagsList.add("public"); |
| 542 | } |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 543 | if ((flags & DEXOPT_SECONDARY_DEX) == DEXOPT_SECONDARY_DEX) { |
| 544 | flagsList.add("secondary"); |
| 545 | } |
| 546 | if ((flags & DEXOPT_FORCE) == DEXOPT_FORCE) { |
| 547 | flagsList.add("force"); |
| 548 | } |
| 549 | if ((flags & DEXOPT_STORAGE_CE) == DEXOPT_STORAGE_CE) { |
| 550 | flagsList.add("storage_ce"); |
| 551 | } |
| 552 | if ((flags & DEXOPT_STORAGE_DE) == DEXOPT_STORAGE_DE) { |
| 553 | flagsList.add("storage_de"); |
| 554 | } |
| 555 | |
Calin Juravle | 2d4b6ad7 | 2017-01-04 13:22:14 -0800 | [diff] [blame] | 556 | return String.join(",", flagsList); |
| 557 | } |
| 558 | |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 559 | /** |
| 560 | * A specialized PackageDexOptimizer that overrides already-installed checks, forcing a |
| 561 | * dexopt path. |
| 562 | */ |
| 563 | public static class ForcedUpdatePackageDexOptimizer extends PackageDexOptimizer { |
| 564 | |
| 565 | public ForcedUpdatePackageDexOptimizer(Installer installer, Object installLock, |
| 566 | Context context, String wakeLockTag) { |
| 567 | super(installer, installLock, context, wakeLockTag); |
| 568 | } |
| 569 | |
| 570 | public ForcedUpdatePackageDexOptimizer(PackageDexOptimizer from) { |
| 571 | super(from); |
| 572 | } |
| 573 | |
| 574 | @Override |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 575 | protected int adjustDexoptNeeded(int dexoptNeeded) { |
Nicolas Geoffray | 96d12a9 | 2017-05-03 11:51:53 +0100 | [diff] [blame] | 576 | if (dexoptNeeded == DexFile.NO_DEXOPT_NEEDED) { |
| 577 | // Ensure compilation by pretending a compiler filter change on the |
| 578 | // apk/odex location (the reason for the '-'. A positive value means |
| 579 | // the 'oat' location). |
| 580 | return -DexFile.DEX2OAT_FOR_FILTER; |
| 581 | } |
| 582 | return dexoptNeeded; |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 583 | } |
Calin Juravle | c22c30e | 2017-01-16 19:18:48 -0800 | [diff] [blame] | 584 | |
| 585 | @Override |
| 586 | protected int adjustDexoptFlags(int flags) { |
| 587 | // Add DEXOPT_FORCE flag to signal installd that it should force compilation |
| 588 | // and discard dexoptanalyzer result. |
| 589 | return flags | DEXOPT_FORCE; |
| 590 | } |
Andreas Gampe | a890875 | 2015-11-10 08:58:14 -0800 | [diff] [blame] | 591 | } |
Fyodor Kupolov | 7487657 | 2015-02-23 17:14:45 -0800 | [diff] [blame] | 592 | } |