Replace "DexOptimizer" with "Dexopter".
Bug: 265248684
Test: atest ArtServiceTests
Ignore-AOSP-First: ART Services.
Change-Id: Ibc61b1c64bd25e1203ef9f38b98b2ba70c7b4c0b
diff --git a/libartservice/service/java/com/android/server/art/DexoptHelper.java b/libartservice/service/java/com/android/server/art/DexoptHelper.java
index 11faed2..1e04bd0 100644
--- a/libartservice/service/java/com/android/server/art/DexoptHelper.java
+++ b/libartservice/service/java/com/android/server/art/DexoptHelper.java
@@ -62,7 +62,7 @@
/**
* A helper class to handle dexopt.
*
- * It talks to other components (e.g., PowerManager) and dispatches tasks to dex optimizers.
+ * It talks to other components (e.g., PowerManager) and dispatches tasks to dexopters.
*
* @hide
*/
@@ -222,7 +222,7 @@
}
results.addAll(
- mInjector.getPrimaryDexOptimizer(pkgState, pkg, params, cancellationSignal)
+ mInjector.getPrimaryDexopter(pkgState, pkg, params, cancellationSignal)
.dexopt());
}
@@ -232,8 +232,7 @@
}
results.addAll(
- mInjector
- .getSecondaryDexOptimizer(pkgState, pkg, params, cancellationSignal)
+ mInjector.getSecondaryDexopter(pkgState, pkg, params, cancellationSignal)
.dexopt());
}
} catch (RemoteException e) {
@@ -317,17 +316,17 @@
}
@NonNull
- PrimaryDexOptimizer getPrimaryDexOptimizer(@NonNull PackageState pkgState,
+ PrimaryDexopter getPrimaryDexopter(@NonNull PackageState pkgState,
@NonNull AndroidPackage pkg, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
- return new PrimaryDexOptimizer(mContext, pkgState, pkg, params, cancellationSignal);
+ return new PrimaryDexopter(mContext, pkgState, pkg, params, cancellationSignal);
}
@NonNull
- SecondaryDexOptimizer getSecondaryDexOptimizer(@NonNull PackageState pkgState,
+ SecondaryDexopter getSecondaryDexopter(@NonNull PackageState pkgState,
@NonNull AndroidPackage pkg, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
- return new SecondaryDexOptimizer(mContext, pkgState, pkg, params, cancellationSignal);
+ return new SecondaryDexopter(mContext, pkgState, pkg, params, cancellationSignal);
}
@NonNull
diff --git a/libartservice/service/java/com/android/server/art/DexOptimizer.java b/libartservice/service/java/com/android/server/art/Dexopter.java
similarity index 96%
rename from libartservice/service/java/com/android/server/art/DexOptimizer.java
rename to libartservice/service/java/com/android/server/art/Dexopter.java
index 1cbe5db..6e220c7 100644
--- a/libartservice/service/java/com/android/server/art/DexOptimizer.java
+++ b/libartservice/service/java/com/android/server/art/Dexopter.java
@@ -57,8 +57,8 @@
import java.util.Objects;
/** @hide */
-public abstract class DexOptimizer<DexInfoType extends DetailedDexInfo> {
- private static final String TAG = "DexOptimizer";
+public abstract class Dexopter<DexInfoType extends DetailedDexInfo> {
+ private static final String TAG = "Dexopter";
@NonNull protected final Injector mInjector;
@NonNull protected final PackageState mPkgState;
@@ -67,7 +67,7 @@
@NonNull protected final DexoptParams mParams;
@NonNull protected final CancellationSignal mCancellationSignal;
- protected DexOptimizer(@NonNull Injector injector, @NonNull PackageState pkgState,
+ protected Dexopter(@NonNull Injector injector, @NonNull PackageState pkgState,
@NonNull AndroidPackage pkg, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
mInjector = injector;
@@ -157,17 +157,16 @@
boolean isSkippedDueToStorageLow = false;
try {
var target = DexoptTarget.<DexInfoType>builder()
- .setDexInfo(dexInfo)
- .setIsa(abi.isa())
- .setIsInDalvikCache(isInDalvikCache())
- .setCompilerFilter(compilerFilter)
- .build();
- var options =
- GetDexoptNeededOptions.builder()
- .setProfileMerged(profileMerged)
- .setFlags(mParams.getFlags())
- .setNeedsToBePublic(needsToBeShared)
- .build();
+ .setDexInfo(dexInfo)
+ .setIsa(abi.isa())
+ .setIsInDalvikCache(isInDalvikCache())
+ .setCompilerFilter(compilerFilter)
+ .build();
+ var options = GetDexoptNeededOptions.builder()
+ .setProfileMerged(profileMerged)
+ .setFlags(mParams.getFlags())
+ .setNeedsToBePublic(needsToBeShared)
+ .build();
GetDexoptNeededResult getDexoptNeededResult =
getDexoptNeeded(target, options);
@@ -604,7 +603,7 @@
abstract @NonNull String compilerFilter();
static <DexInfoType extends DetailedDexInfo> Builder<DexInfoType> builder() {
- return new AutoValue_DexOptimizer_DexoptTarget.Builder<DexInfoType>();
+ return new AutoValue_Dexopter_DexoptTarget.Builder<DexInfoType>();
}
@AutoValue.Builder
@@ -624,7 +623,7 @@
abstract boolean needsToBePublic();
static Builder builder() {
- return new AutoValue_DexOptimizer_GetDexoptNeededOptions.Builder();
+ return new AutoValue_Dexopter_GetDexoptNeededOptions.Builder();
}
@AutoValue.Builder
diff --git a/libartservice/service/java/com/android/server/art/PrimaryDexOptimizer.java b/libartservice/service/java/com/android/server/art/PrimaryDexopter.java
similarity index 96%
rename from libartservice/service/java/com/android/server/art/PrimaryDexOptimizer.java
rename to libartservice/service/java/com/android/server/art/PrimaryDexopter.java
index 635fe8b..5e83f2d 100644
--- a/libartservice/service/java/com/android/server/art/PrimaryDexOptimizer.java
+++ b/libartservice/service/java/com/android/server/art/PrimaryDexopter.java
@@ -49,19 +49,19 @@
import java.util.Objects;
/** @hide */
-public class PrimaryDexOptimizer extends DexOptimizer<DetailedPrimaryDexInfo> {
- private static final String TAG = "PrimaryDexOptimizer";
+public class PrimaryDexopter extends Dexopter<DetailedPrimaryDexInfo> {
+ private static final String TAG = "PrimaryDexopter";
private final int mSharedGid;
- public PrimaryDexOptimizer(@NonNull Context context, @NonNull PackageState pkgState,
+ public PrimaryDexopter(@NonNull Context context, @NonNull PackageState pkgState,
@NonNull AndroidPackage pkg, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
this(new Injector(context), pkgState, pkg, params, cancellationSignal);
}
@VisibleForTesting
- public PrimaryDexOptimizer(@NonNull Injector injector, @NonNull PackageState pkgState,
+ public PrimaryDexopter(@NonNull Injector injector, @NonNull PackageState pkgState,
@NonNull AndroidPackage pkg, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
super(injector, pkgState, pkg, params, cancellationSignal);
diff --git a/libartservice/service/java/com/android/server/art/SecondaryDexOptimizer.java b/libartservice/service/java/com/android/server/art/SecondaryDexopter.java
similarity index 93%
rename from libartservice/service/java/com/android/server/art/SecondaryDexOptimizer.java
rename to libartservice/service/java/com/android/server/art/SecondaryDexopter.java
index 5d5a227..b751073 100644
--- a/libartservice/service/java/com/android/server/art/SecondaryDexOptimizer.java
+++ b/libartservice/service/java/com/android/server/art/SecondaryDexopter.java
@@ -34,17 +34,17 @@
import java.util.List;
/** @hide */
-public class SecondaryDexOptimizer extends DexOptimizer<DetailedSecondaryDexInfo> {
- private static final String TAG = "SecondaryDexOptimizer";
+public class SecondaryDexopter extends Dexopter<DetailedSecondaryDexInfo> {
+ private static final String TAG = "SecondaryDexopter";
- public SecondaryDexOptimizer(@NonNull Context context, @NonNull PackageState pkgState,
+ public SecondaryDexopter(@NonNull Context context, @NonNull PackageState pkgState,
@NonNull AndroidPackage pkg, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
this(new Injector(context), pkgState, pkg, params, cancellationSignal);
}
@VisibleForTesting
- public SecondaryDexOptimizer(@NonNull Injector injector, @NonNull PackageState pkgState,
+ public SecondaryDexopter(@NonNull Injector injector, @NonNull PackageState pkgState,
@NonNull AndroidPackage pkg, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
super(injector, pkgState, pkg, params, cancellationSignal);
diff --git a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java b/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
index 8530828..4f2e38c 100644
--- a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
+++ b/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
@@ -83,8 +83,8 @@
private static final String PKG_NAME_LIBBAZ = "com.example.libbaz";
@Mock private DexoptHelper.Injector mInjector;
- @Mock private PrimaryDexOptimizer mPrimaryDexOptimizer;
- @Mock private SecondaryDexOptimizer mSecondaryDexOptimizer;
+ @Mock private PrimaryDexopter mPrimaryDexopter;
+ @Mock private SecondaryDexopter mSecondaryDexopter;
@Mock private AppHibernationManager mAhm;
@Mock private PowerManager mPowerManager;
@Mock private PowerManager.WakeLock mWakeLock;
@@ -133,14 +133,14 @@
DexoptResult.DEXOPT_PERFORMED /* status2 */);
lenient()
- .when(mInjector.getPrimaryDexOptimizer(any(), any(), any(), any()))
- .thenReturn(mPrimaryDexOptimizer);
- lenient().when(mPrimaryDexOptimizer.dexopt()).thenReturn(mPrimaryResults);
+ .when(mInjector.getPrimaryDexopter(any(), any(), any(), any()))
+ .thenReturn(mPrimaryDexopter);
+ lenient().when(mPrimaryDexopter.dexopt()).thenReturn(mPrimaryResults);
lenient()
- .when(mInjector.getSecondaryDexOptimizer(any(), any(), any(), any()))
- .thenReturn(mSecondaryDexOptimizer);
- lenient().when(mSecondaryDexOptimizer.dexopt()).thenReturn(mSecondaryResults);
+ .when(mInjector.getSecondaryDexopter(any(), any(), any(), any()))
+ .thenReturn(mSecondaryDexopter);
+ lenient().when(mSecondaryDexopter.dexopt()).thenReturn(mSecondaryResults);
mParams = new DexoptParams.Builder("install")
.setCompilerFilter("speed-profile")
@@ -165,13 +165,13 @@
@Test
public void testDexopt() throws Exception {
// Only package libbaz fails.
- var failingPrimaryDexOptimizer = mock(PrimaryDexOptimizer.class);
+ var failingPrimaryDexopter = mock(PrimaryDexopter.class);
List<DexContainerFileDexoptResult> partialFailureResults =
createResults("/data/app/foo/base.apk", DexoptResult.DEXOPT_PERFORMED /* status1 */,
DexoptResult.DEXOPT_FAILED /* status2 */);
- lenient().when(failingPrimaryDexOptimizer.dexopt()).thenReturn(partialFailureResults);
- when(mInjector.getPrimaryDexOptimizer(same(mPkgStateLibbaz), any(), any(), any()))
- .thenReturn(failingPrimaryDexOptimizer);
+ lenient().when(failingPrimaryDexopter.dexopt()).thenReturn(partialFailureResults);
+ when(mInjector.getPrimaryDexopter(same(mPkgStateLibbaz), any(), any(), any()))
+ .thenReturn(failingPrimaryDexopter);
DexoptResult result = mDexOptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
@@ -202,29 +202,29 @@
InOrder inOrder = inOrder(mInjector, mWakeLock);
inOrder.verify(mWakeLock).setWorkSource(any());
inOrder.verify(mWakeLock).acquire(anyLong());
- inOrder.verify(mInjector).getPrimaryDexOptimizer(
+ inOrder.verify(mInjector).getPrimaryDexopter(
same(mPkgStateFoo), same(mPkgFoo), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getSecondaryDexOptimizer(
+ inOrder.verify(mInjector).getSecondaryDexopter(
same(mPkgStateFoo), same(mPkgFoo), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getPrimaryDexOptimizer(
+ inOrder.verify(mInjector).getPrimaryDexopter(
same(mPkgStateBar), same(mPkgBar), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getSecondaryDexOptimizer(
+ inOrder.verify(mInjector).getSecondaryDexopter(
same(mPkgStateBar), same(mPkgBar), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getPrimaryDexOptimizer(
+ inOrder.verify(mInjector).getPrimaryDexopter(
same(mPkgStateLibbaz), same(mPkgLibbaz), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getSecondaryDexOptimizer(
+ inOrder.verify(mInjector).getSecondaryDexopter(
same(mPkgStateLibbaz), same(mPkgLibbaz), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getPrimaryDexOptimizer(
+ inOrder.verify(mInjector).getPrimaryDexopter(
same(mPkgStateLib1), same(mPkgLib1), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getSecondaryDexOptimizer(
+ inOrder.verify(mInjector).getSecondaryDexopter(
same(mPkgStateLib1), same(mPkgLib1), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getPrimaryDexOptimizer(
+ inOrder.verify(mInjector).getPrimaryDexopter(
same(mPkgStateLib2), same(mPkgLib2), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getSecondaryDexOptimizer(
+ inOrder.verify(mInjector).getSecondaryDexopter(
same(mPkgStateLib2), same(mPkgLib2), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getPrimaryDexOptimizer(
+ inOrder.verify(mInjector).getPrimaryDexopter(
same(mPkgStateLib4), same(mPkgLib4), same(mParams), same(mCancellationSignal));
- inOrder.verify(mInjector).getSecondaryDexOptimizer(
+ inOrder.verify(mInjector).getSecondaryDexopter(
same(mPkgStateLib4), same(mPkgLib4), same(mParams), same(mCancellationSignal));
inOrder.verify(mWakeLock).release();
@@ -310,7 +310,7 @@
@Test
public void testDexoptCancelledBetweenDex2oatInvocations() throws Exception {
- when(mPrimaryDexOptimizer.dexopt()).thenAnswer(invocation -> {
+ when(mPrimaryDexopter.dexopt()).thenAnswer(invocation -> {
mCancellationSignal.cancel();
return mPrimaryResults;
});
@@ -334,7 +334,7 @@
checkPackageResult(
result, 5 /* index */, PKG_NAME_LIB4, DexoptResult.DEXOPT_CANCELLED, List.of());
- verify(mInjector).getPrimaryDexOptimizer(
+ verify(mInjector).getPrimaryDexopter(
same(mPkgStateFoo), same(mPkgFoo), same(mParams), same(mCancellationSignal));
verifyNoMoreDexopt(1 /* expectedPrimaryTimes */, 0 /* expectedSecondaryTimes */);
@@ -412,7 +412,7 @@
@Test
public void testDexoptAlwaysReleasesWakeLock() throws Exception {
- when(mPrimaryDexOptimizer.dexopt()).thenThrow(IllegalStateException.class);
+ when(mPrimaryDexopter.dexopt()).thenThrow(IllegalStateException.class);
try {
mDexOptHelper.dexopt(
@@ -539,19 +539,19 @@
List<DexContainerFileDexoptResult> partialFailureResults =
createResults("/data/app/foo/base.apk", DexoptResult.DEXOPT_PERFORMED /* status1 */,
DexoptResult.DEXOPT_FAILED /* status2 */);
- var fooPrimaryDexOptimizer = mock(PrimaryDexOptimizer.class);
- when(mInjector.getPrimaryDexOptimizer(same(mPkgStateFoo), any(), any(), any()))
- .thenReturn(fooPrimaryDexOptimizer);
- when(fooPrimaryDexOptimizer.dexopt()).thenReturn(partialFailureResults);
+ var fooPrimaryDexopter = mock(PrimaryDexopter.class);
+ when(mInjector.getPrimaryDexopter(same(mPkgStateFoo), any(), any(), any()))
+ .thenReturn(fooPrimaryDexopter);
+ when(fooPrimaryDexopter.dexopt()).thenReturn(partialFailureResults);
// Dexopt totally fails on package "bar".
List<DexContainerFileDexoptResult> totalFailureResults =
createResults("/data/app/bar/base.apk", DexoptResult.DEXOPT_FAILED /* status1 */,
DexoptResult.DEXOPT_FAILED /* status2 */);
- var barPrimaryDexOptimizer = mock(PrimaryDexOptimizer.class);
- when(mInjector.getPrimaryDexOptimizer(same(mPkgStateBar), any(), any(), any()))
- .thenReturn(barPrimaryDexOptimizer);
- when(barPrimaryDexOptimizer.dexopt()).thenReturn(totalFailureResults);
+ var barPrimaryDexopter = mock(PrimaryDexopter.class);
+ when(mInjector.getPrimaryDexopter(same(mPkgStateBar), any(), any(), any()))
+ .thenReturn(barPrimaryDexopter);
+ when(barPrimaryDexopter.dexopt()).thenReturn(totalFailureResults);
DexoptResult resultWithSomeUpdates = mDexOptHelper.dexopt(mSnapshot,
List.of(PKG_NAME_FOO, PKG_NAME_BAR), mParams, mCancellationSignal, mExecutor);
@@ -692,15 +692,15 @@
}
private void verifyNoDexopt() {
- verify(mInjector, never()).getPrimaryDexOptimizer(any(), any(), any(), any());
- verify(mInjector, never()).getSecondaryDexOptimizer(any(), any(), any(), any());
+ verify(mInjector, never()).getPrimaryDexopter(any(), any(), any(), any());
+ verify(mInjector, never()).getSecondaryDexopter(any(), any(), any(), any());
}
private void verifyNoMoreDexopt(int expectedPrimaryTimes, int expectedSecondaryTimes) {
verify(mInjector, times(expectedPrimaryTimes))
- .getPrimaryDexOptimizer(any(), any(), any(), any());
+ .getPrimaryDexopter(any(), any(), any(), any());
verify(mInjector, times(expectedSecondaryTimes))
- .getSecondaryDexOptimizer(any(), any(), any(), any());
+ .getSecondaryDexopter(any(), any(), any(), any());
}
private List<DexContainerFileDexoptResult> createResults(
diff --git a/libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerParameterizedTest.java b/libartservice/service/javatests/com/android/server/art/PrimaryDexopterParameterizedTest.java
similarity index 97%
rename from libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerParameterizedTest.java
rename to libartservice/service/javatests/com/android/server/art/PrimaryDexopterParameterizedTest.java
index 717a5d3..a5245c1 100644
--- a/libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerParameterizedTest.java
+++ b/libartservice/service/javatests/com/android/server/art/PrimaryDexopterParameterizedTest.java
@@ -62,7 +62,7 @@
@SmallTest
@RunWith(Parameterized.class)
-public class PrimaryDexOptimizerParameterizedTest extends PrimaryDexOptimizerTestBase {
+public class PrimaryDexopterParameterizedTest extends PrimaryDexopterTestBase {
@Rule
public OnSuccessRule onSuccessRule = new OnSuccessRule(() -> {
// Don't do this on failure because it will make the failure hard to understand.
@@ -71,7 +71,7 @@
private DexoptParams mDexoptParams;
- private PrimaryDexOptimizer mPrimaryDexOptimizer;
+ private PrimaryDexopter mPrimaryDexopter;
@Parameter(0) public Params mParams;
@@ -195,8 +195,8 @@
ArtFlags.FLAG_SKIP_IF_STORAGE_LOW)
.build();
- mPrimaryDexOptimizer = new PrimaryDexOptimizer(
- mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
+ mPrimaryDexopter =
+ new PrimaryDexopter(mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
}
@Test
@@ -267,7 +267,7 @@
isNull() /* inputVdex */, isNull() /* dmFile */,
eq(PriorityClass.INTERACTIVE), deepEq(dexoptOptions), any());
- assertThat(mPrimaryDexOptimizer.dexopt())
+ assertThat(mPrimaryDexopter.dexopt())
.comparingElementsUsing(TestingUtils.<DexContainerFileDexoptResult>deepEquality())
.containsExactly(
DexContainerFileDexoptResult.create("/data/app/foo/base.apk",
diff --git a/libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerTest.java b/libartservice/service/javatests/com/android/server/art/PrimaryDexopterTest.java
similarity index 95%
rename from libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerTest.java
rename to libartservice/service/javatests/com/android/server/art/PrimaryDexopterTest.java
index 6c5f1af..c474f41 100644
--- a/libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerTest.java
+++ b/libartservice/service/javatests/com/android/server/art/PrimaryDexopterTest.java
@@ -65,7 +65,7 @@
@SmallTest
@RunWith(AndroidJUnit4.class)
-public class PrimaryDexOptimizerTest extends PrimaryDexOptimizerTestBase {
+public class PrimaryDexopterTest extends PrimaryDexopterTestBase {
private final String mDexPath = "/data/app/foo/base.apk";
private final ProfilePath mRefProfile =
AidlUtils.buildProfilePathForPrimaryRef(PKG_NAME, "primary");
@@ -98,7 +98,7 @@
private DexoptParams mDexoptParams =
new DexoptParams.Builder("install").setCompilerFilter("speed-profile").build();
- private PrimaryDexOptimizer mPrimaryDexOptimizer;
+ private PrimaryDexopter mPrimaryDexopter;
private List<ProfilePath> mUsedProfiles;
@@ -126,8 +126,8 @@
.when(mArtd.createCancellationSignal())
.thenReturn(mock(IArtdCancellationSignal.class));
- mPrimaryDexOptimizer = new PrimaryDexOptimizer(
- mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
+ mPrimaryDexopter =
+ new PrimaryDexopter(mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
mUsedProfiles = new ArrayList<>();
}
@@ -174,7 +174,7 @@
.dexopt(any(), eq(mSplit0DexPath), eq("arm"), any(), any(), any(), isNull(), any(),
anyInt(), any(), any());
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
}
@Test
@@ -183,7 +183,7 @@
.when(mArtd.getDmFileVisibility(deepEq(mDmFile)))
.thenReturn(FileVisibility.OTHER_READABLE);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd, times(2))
.dexopt(any(), eq(mDexPath), any(), any(), any(), any(), any(), deepEq(mDmFile),
@@ -208,7 +208,7 @@
makeProfileUsable(mPrebuiltProfile);
makeProfileUsable(mDmProfile);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd).getDexoptNeeded(
eq(mDexPath), eq("arm64"), any(), eq("speed-profile"), eq(mDefaultDexoptTrigger));
@@ -244,7 +244,7 @@
makeProfileUsable(mPrebuiltProfile);
makeProfileUsable(mDmProfile);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
checkDexoptWithProfile(verify(mArtd), mDexPath, "arm64", mRefProfile,
true /* isOtherReadable */, true /* generateAppImage */);
@@ -261,7 +261,7 @@
makeProfileUsable(mPrebuiltProfile);
makeProfileUsable(mDmProfile);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
InOrder inOrder = inOrder(mArtd);
@@ -292,7 +292,7 @@
when(mArtd.getProfileVisibility(deepEq(mRefProfile)))
.thenReturn(FileVisibility.OTHER_READABLE);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
InOrder inOrder = inOrder(mArtd);
@@ -336,7 +336,7 @@
when(mArtd.getProfileVisibility(deepEq(mRefProfile)))
.thenReturn(FileVisibility.OTHER_READABLE);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
// It should still use "speed-profile", but with the existing reference profile only.
verify(mArtd).getDexoptNeeded(
@@ -359,7 +359,7 @@
makeProfileNotUsable(mPrebuiltProfile);
makeProfileUsable(mDmProfile);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd).copyAndRewriteProfile(
deepEq(mDmProfile), deepEq(mPublicOutputProfile), eq(mDexPath));
@@ -385,7 +385,7 @@
any(), any()))
.thenThrow(ServiceSpecificException.class);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd).deleteProfile(
deepEq(ProfilePath.tmpProfilePath(mPublicOutputProfile.profilePath)));
@@ -410,7 +410,7 @@
argThat(artifactsPath -> artifactsPath.dexPath == mDexPath)))
.thenReturn(FileVisibility.NOT_OTHER_READABLE);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd).copyAndRewriteProfile(
deepEq(mDmProfile), deepEq(mPublicOutputProfile), eq(mDexPath));
@@ -450,7 +450,7 @@
argThat(artifactsPath -> artifactsPath.dexPath == mDexPath)))
.thenReturn(FileVisibility.OTHER_READABLE);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
// It should use the default dexopt trigger.
verify(mArtd).getDexoptNeeded(
@@ -465,7 +465,7 @@
when(mArtd.getProfileVisibility(deepEq(mSplit0RefProfile)))
.thenReturn(FileVisibility.NOT_OTHER_READABLE);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd).getDexoptNeeded(eq(mSplit0DexPath), eq("arm64"), any(), eq("speed-profile"),
eq(mDefaultDexoptTrigger));
@@ -495,7 +495,7 @@
// The result should only contain one element: the result of the first file with
// DEXOPT_CANCELLED.
- assertThat(mPrimaryDexOptimizer.dexopt()
+ assertThat(mPrimaryDexopter.dexopt()
.stream()
.map(DexContainerFileDexoptResult::getStatus)
.collect(Collectors.toList()))
@@ -533,7 +533,7 @@
.cancel();
Future<List<DexContainerFileDexoptResult>> results =
- ForkJoinPool.commonPool().submit(() -> { return mPrimaryDexOptimizer.dexopt(); });
+ ForkJoinPool.commonPool().submit(() -> { return mPrimaryDexopter.dexopt(); });
assertThat(dexoptStarted.tryAcquire(TIMEOUT_SEC, TimeUnit.SECONDS)).isTrue();
@@ -560,10 +560,10 @@
.setFlags(ArtFlags.FLAG_FOR_PRIMARY_DEX | ArtFlags.FLAG_FOR_SINGLE_SPLIT)
.setSplitName(null)
.build();
- mPrimaryDexOptimizer = new PrimaryDexOptimizer(
- mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
+ mPrimaryDexopter =
+ new PrimaryDexopter(mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd, times(2))
.dexopt(any(), eq(mDexPath), any(), any(), any(), any(), any(), any(), anyInt(),
@@ -581,10 +581,10 @@
.setFlags(ArtFlags.FLAG_FOR_PRIMARY_DEX | ArtFlags.FLAG_FOR_SINGLE_SPLIT)
.setSplitName("split_0")
.build();
- mPrimaryDexOptimizer = new PrimaryDexOptimizer(
- mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
+ mPrimaryDexopter =
+ new PrimaryDexopter(mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
- mPrimaryDexOptimizer.dexopt();
+ mPrimaryDexopter.dexopt();
verify(mArtd, never())
.dexopt(any(), eq(mDexPath), any(), any(), any(), any(), any(), any(), anyInt(),
@@ -603,10 +603,10 @@
.setCompilerFilter("speed-profile")
.setFlags(ArtFlags.FLAG_FOR_PRIMARY_DEX | ArtFlags.FLAG_SKIP_IF_STORAGE_LOW)
.build();
- mPrimaryDexOptimizer = new PrimaryDexOptimizer(
- mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
+ mPrimaryDexopter =
+ new PrimaryDexopter(mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
- List<DexContainerFileDexoptResult> results = mPrimaryDexOptimizer.dexopt();
+ List<DexContainerFileDexoptResult> results = mPrimaryDexopter.dexopt();
assertThat(results.get(0).getStatus()).isEqualTo(DexoptResult.DEXOPT_PERFORMED);
assertThat(results.get(0).isSkippedDueToStorageLow()).isFalse();
assertThat(results.get(1).getStatus()).isEqualTo(DexoptResult.DEXOPT_SKIPPED);
diff --git a/libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerTestBase.java b/libartservice/service/javatests/com/android/server/art/PrimaryDexopterTestBase.java
similarity index 97%
rename from libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerTestBase.java
rename to libartservice/service/javatests/com/android/server/art/PrimaryDexopterTestBase.java
index d068c65..fb31508 100644
--- a/libartservice/service/javatests/com/android/server/art/PrimaryDexOptimizerTestBase.java
+++ b/libartservice/service/javatests/com/android/server/art/PrimaryDexopterTestBase.java
@@ -47,7 +47,7 @@
import java.util.ArrayList;
import java.util.List;
-public class PrimaryDexOptimizerTestBase {
+public class PrimaryDexopterTestBase {
protected static final String PKG_NAME = "com.example.foo";
protected static final int UID = 12345;
protected static final int SHARED_GID = UserHandle.getSharedAppGid(UID);
@@ -56,7 +56,7 @@
public StaticMockitoRule mockitoRule =
new StaticMockitoRule(SystemProperties.class, Constants.class);
- @Mock protected PrimaryDexOptimizer.Injector mInjector;
+ @Mock protected PrimaryDexopter.Injector mInjector;
@Mock protected IArtd mArtd;
@Mock protected UserManager mUserManager;
@Mock protected DexUseManagerLocal mDexUseManager;
@@ -149,9 +149,7 @@
lenient().when(pkgState.isUpdatedSystemApp()).thenReturn(false);
lenient().when(pkgState.getAppId()).thenReturn(UID);
lenient().when(pkgState.getUsesLibraries()).thenReturn(new ArrayList<>());
- lenient()
- .when(pkgState.getStateForUser(any()))
- .thenReturn(mPkgUserStateNotInstalled);
+ lenient().when(pkgState.getStateForUser(any())).thenReturn(mPkgUserStateNotInstalled);
AndroidPackage pkg = createPackage();
lenient().when(pkgState.getAndroidPackage()).thenReturn(pkg);
return pkgState;
diff --git a/libartservice/service/javatests/com/android/server/art/SecondaryDexOptimizerTest.java b/libartservice/service/javatests/com/android/server/art/SecondaryDexopterTest.java
similarity index 98%
rename from libartservice/service/javatests/com/android/server/art/SecondaryDexOptimizerTest.java
rename to libartservice/service/javatests/com/android/server/art/SecondaryDexopterTest.java
index f72b6ce..cd1be03 100644
--- a/libartservice/service/javatests/com/android/server/art/SecondaryDexOptimizerTest.java
+++ b/libartservice/service/javatests/com/android/server/art/SecondaryDexopterTest.java
@@ -65,7 +65,7 @@
@SmallTest
@RunWith(AndroidJUnit4.class)
-public class SecondaryDexOptimizerTest {
+public class SecondaryDexopterTest {
private static final String PKG_NAME = "com.example.foo";
private static final int APP_ID = 12345;
private static final UserHandle USER_HANDLE = UserHandle.of(2);
@@ -100,14 +100,14 @@
public StaticMockitoRule mockitoRule =
new StaticMockitoRule(SystemProperties.class, Constants.class);
- @Mock private SecondaryDexOptimizer.Injector mInjector;
+ @Mock private SecondaryDexopter.Injector mInjector;
@Mock private IArtd mArtd;
@Mock private DexUseManagerLocal mDexUseManager;
private PackageState mPkgState;
private AndroidPackage mPkg;
private CancellationSignal mCancellationSignal;
- private SecondaryDexOptimizer mSecondaryDexOptimizer;
+ private SecondaryDexopter mSecondaryDexopter;
@Before
public void setUp() throws Exception {
@@ -154,13 +154,13 @@
.when(mArtd.createCancellationSignal())
.thenReturn(mock(IArtdCancellationSignal.class));
- mSecondaryDexOptimizer = new SecondaryDexOptimizer(
+ mSecondaryDexopter = new SecondaryDexopter(
mInjector, mPkgState, mPkg, mDexoptParams, mCancellationSignal);
}
@Test
public void testDexopt() throws Exception {
- assertThat(mSecondaryDexOptimizer.dexopt())
+ assertThat(mSecondaryDexopter.dexopt())
.comparingElementsUsing(TestingUtils.<DexContainerFileDexoptResult>deepEquality())
.containsExactly(
DexContainerFileDexoptResult.create(DEX_1, true /* isPrimaryAbi */,