Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc51f169 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by android-build-merger
Browse files

Merge "Fixing checkstyle presubmit hook comments." 

am: 29444579

Change-Id: Ie9758322c6bcea572d8976b0ea85012f976d0bca
parents 9890b01a 29444579

services/core/java/com/android/server/pm/PackageDexOptimizer.java

+24 −28
Original line number Diff line number Diff line
@@ -16,6 +16,28 @@ 


package com.android.server.pm;



import static android.content.pm.ApplicationInfo.HIDDEN_API_ENFORCEMENT_DISABLED;



import static com.android.server.pm.Installer.DEXOPT_BOOTCOMPLETE;

import static com.android.server.pm.Installer.DEXOPT_DEBUGGABLE;

import static com.android.server.pm.Installer.DEXOPT_ENABLE_HIDDEN_API_CHECKS;

import static com.android.server.pm.Installer.DEXOPT_FORCE;

import static com.android.server.pm.Installer.DEXOPT_GENERATE_APP_IMAGE;

import static com.android.server.pm.Installer.DEXOPT_GENERATE_COMPACT_DEX;

import static com.android.server.pm.Installer.DEXOPT_IDLE_BACKGROUND_JOB;

import static com.android.server.pm.Installer.DEXOPT_PROFILE_GUIDED;

import static com.android.server.pm.Installer.DEXOPT_PUBLIC;

import static com.android.server.pm.Installer.DEXOPT_SECONDARY_DEX;

import static com.android.server.pm.Installer.DEXOPT_STORAGE_CE;

import static com.android.server.pm.Installer.DEXOPT_STORAGE_DE;

import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;

import static com.android.server.pm.PackageManagerService.WATCHDOG_TIMEOUT;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getReasonName;



import static dalvik.system.DexFile.getSafeModeCompilerFilter;

import static dalvik.system.DexFile.isProfileGuidedCompilerFilter;



import android.annotation.Nullable;

import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -25,12 +47,10 @@ import android.content.pm.dex.ArtManager; 
import android.content.pm.dex.DexMetadataHelper;

import android.os.FileUtils;

import android.os.PowerManager;

import android.os.Process;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.WorkSource;

import android.os.storage.StorageManager;

import android.util.Log;

import android.util.Slog;
@@ -43,6 +63,8 @@ import com.android.server.pm.dex.DexoptOptions; 
import com.android.server.pm.dex.DexoptUtils;

import com.android.server.pm.dex.PackageDexUsage;



import dalvik.system.DexFile;



import java.io.File;

import java.io.IOException;

import java.util.ArrayList;
@@ -50,32 +72,6 @@ import java.util.Arrays; 
import java.util.List;

import java.util.Map;



import dalvik.system.DexFile;



import static android.content.pm.ApplicationInfo.HIDDEN_API_ENFORCEMENT_DISABLED;



import static com.android.server.pm.Installer.DEXOPT_BOOTCOMPLETE;

import static com.android.server.pm.Installer.DEXOPT_DEBUGGABLE;

import static com.android.server.pm.Installer.DEXOPT_PROFILE_GUIDED;

import static com.android.server.pm.Installer.DEXOPT_PUBLIC;

import static com.android.server.pm.Installer.DEXOPT_SECONDARY_DEX;

import static com.android.server.pm.Installer.DEXOPT_FORCE;

import static com.android.server.pm.Installer.DEXOPT_STORAGE_CE;

import static com.android.server.pm.Installer.DEXOPT_STORAGE_DE;

import static com.android.server.pm.Installer.DEXOPT_IDLE_BACKGROUND_JOB;

import static com.android.server.pm.Installer.DEXOPT_ENABLE_HIDDEN_API_CHECKS;

import static com.android.server.pm.Installer.DEXOPT_GENERATE_COMPACT_DEX;

import static com.android.server.pm.Installer.DEXOPT_GENERATE_APP_IMAGE;

import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;



import static com.android.server.pm.PackageManagerService.WATCHDOG_TIMEOUT;



import static com.android.server.pm.PackageManagerServiceCompilerMapping.getReasonName;



import static dalvik.system.DexFile.getSafeModeCompilerFilter;

import static dalvik.system.DexFile.isProfileGuidedCompilerFilter;



/**

 * Helper class for running dexopt command on packages.

 */