Replace "DexOpt" with "Dexopt".
Bug: 265248684
Test: atest ArtServiceTests
Ignore-AOSP-First: ART Services.
Change-Id: Idd3abea1af2c5a6075044cb1238d7266d5b8d88a
diff --git a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java b/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
index e904972..4c34df2 100644
--- a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
+++ b/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
@@ -388,7 +388,7 @@
public DexoptResult dexoptPackage(@NonNull PackageManagerLocal.FilteredSnapshot snapshot,
@NonNull String packageName, @NonNull DexoptParams params,
@NonNull CancellationSignal cancellationSignal) {
- return mInjector.getDexOptHelper().dexopt(
+ return mInjector.getDexoptHelper().dexopt(
snapshot, List.of(packageName), params, cancellationSignal, Runnable::run);
}
@@ -499,7 +499,7 @@
cancellationSignal, dexoptExecutor);
}
Log.i(TAG, "Dexopting packages");
- return mInjector.getDexOptHelper().dexopt(snapshot, params.getPackages(),
+ return mInjector.getDexoptHelper().dexopt(snapshot, params.getPackages(),
params.getDexoptParams(), cancellationSignal, dexoptExecutor,
progressCallbackExecutor, progressCallback);
} finally {
@@ -562,7 +562,7 @@
* reason {@link ReasonMapping#REASON_BG_DEXOPT}.
*/
public @ScheduleStatus int scheduleBackgroundDexoptJob() {
- return mInjector.getBackgroundDexOptJob().schedule();
+ return mInjector.getBackgroundDexoptJob().schedule();
}
/**
@@ -578,7 +578,7 @@
* #startBackgroundDexoptJob()} will not be cancelled by this method.
*/
public void unscheduleBackgroundDexoptJob() {
- mInjector.getBackgroundDexOptJob().unschedule();
+ mInjector.getBackgroundDexoptJob().unschedule();
}
/**
@@ -613,7 +613,7 @@
* reason {@link ReasonMapping#REASON_BG_DEXOPT}.
*/
public void startBackgroundDexoptJob() {
- mInjector.getBackgroundDexOptJob().start();
+ mInjector.getBackgroundDexoptJob().start();
}
/**
@@ -626,7 +626,7 @@
* DexoptResult#DEXOPT_CANCELLED}.
*/
public void cancelBackgroundDexoptJob() {
- mInjector.getBackgroundDexOptJob().cancel();
+ mInjector.getBackgroundDexoptJob().cancel();
}
/**
@@ -827,8 +827,8 @@
* @hide
*/
@NonNull
- BackgroundDexoptJob getBackgroundDexOptJob() {
- return mInjector.getBackgroundDexOptJob();
+ BackgroundDexoptJob getBackgroundDexoptJob() {
+ return mInjector.getBackgroundDexoptJob();
}
private void maybeDowngradePackages(@NonNull PackageManagerLocal.FilteredSnapshot snapshot,
@@ -841,7 +841,7 @@
.collect(Collectors.toList());
if (!packages.isEmpty()) {
Log.i(TAG, "Storage is low. Downgrading inactive packages");
- mInjector.getDexOptHelper().dexopt(snapshot, packages,
+ mInjector.getDexoptHelper().dexopt(snapshot, packages,
new DexoptParams.Builder(ReasonMapping.REASON_INACTIVE).build(),
cancellationSignal, executor, null /* processCallbackExecutor */,
null /* progressCallback */);
@@ -1025,7 +1025,7 @@
@Nullable private final Context mContext;
@Nullable private final PackageManagerLocal mPackageManagerLocal;
@Nullable private final Config mConfig;
- @Nullable private final BackgroundDexoptJob mBgDexOptJob;
+ @Nullable private final BackgroundDexoptJob mBgDexoptJob;
Injector(@NonNull ArtManagerLocal artManagerLocal, @Nullable Context context) {
mContext = context;
@@ -1034,11 +1034,11 @@
mPackageManagerLocal = Objects.requireNonNull(
LocalManagerRegistry.getManager(PackageManagerLocal.class));
mConfig = new Config();
- mBgDexOptJob = new BackgroundDexoptJob(context, artManagerLocal, mConfig);
+ mBgDexoptJob = new BackgroundDexoptJob(context, artManagerLocal, mConfig);
// Call the getters for various dependencies, to ensure correct initialization
// order.
- getDexOptHelper();
+ getDexoptHelper();
getAppHibernationManager();
getUserManager();
getDexUseManager();
@@ -1047,7 +1047,7 @@
} else {
mPackageManagerLocal = null;
mConfig = null;
- mBgDexOptJob = null;
+ mBgDexoptJob = null;
}
}
@@ -1067,7 +1067,7 @@
}
@NonNull
- public DexoptHelper getDexOptHelper() {
+ public DexoptHelper getDexoptHelper() {
return new DexoptHelper(getContext(), getConfig());
}
@@ -1082,8 +1082,8 @@
}
@NonNull
- public BackgroundDexoptJob getBackgroundDexOptJob() {
- return Objects.requireNonNull(mBgDexOptJob);
+ public BackgroundDexoptJob getBackgroundDexoptJob() {
+ return Objects.requireNonNull(mBgDexoptJob);
}
@NonNull
diff --git a/libartservice/service/java/com/android/server/art/BackgroundDexoptJobService.java b/libartservice/service/java/com/android/server/art/BackgroundDexoptJobService.java
index 5da7279..d6932b1 100644
--- a/libartservice/service/java/com/android/server/art/BackgroundDexoptJobService.java
+++ b/libartservice/service/java/com/android/server/art/BackgroundDexoptJobService.java
@@ -41,6 +41,6 @@
@NonNull
static BackgroundDexoptJob getJob() {
- return LocalManagerRegistry.getManager(ArtManagerLocal.class).getBackgroundDexOptJob();
+ return LocalManagerRegistry.getManager(ArtManagerLocal.class).getBackgroundDexoptJob();
}
}
diff --git a/libartservice/service/javatests/com/android/server/art/ArtManagerLocalTest.java b/libartservice/service/javatests/com/android/server/art/ArtManagerLocalTest.java
index 51987c7..8442a63 100644
--- a/libartservice/service/javatests/com/android/server/art/ArtManagerLocalTest.java
+++ b/libartservice/service/javatests/com/android/server/art/ArtManagerLocalTest.java
@@ -111,7 +111,7 @@
@Mock private PackageManagerLocal mPackageManagerLocal;
@Mock private PackageManagerLocal.FilteredSnapshot mSnapshot;
@Mock private IArtd mArtd;
- @Mock private DexoptHelper mDexOptHelper;
+ @Mock private DexoptHelper mDexoptHelper;
@Mock private AppHibernationManager mAppHibernationManager;
@Mock private UserManager mUserManager;
@Mock private DexUseManagerLocal mDexUseManager;
@@ -139,7 +139,7 @@
// that each test case examines.
lenient().when(mInjector.getPackageManagerLocal()).thenReturn(mPackageManagerLocal);
lenient().when(mInjector.getArtd()).thenReturn(mArtd);
- lenient().when(mInjector.getDexOptHelper()).thenReturn(mDexOptHelper);
+ lenient().when(mInjector.getDexoptHelper()).thenReturn(mDexoptHelper);
lenient().when(mInjector.getConfig()).thenReturn(mConfig);
lenient().when(mInjector.getAppHibernationManager()).thenReturn(mAppHibernationManager);
lenient().when(mInjector.getUserManager()).thenReturn(mUserManager);
@@ -387,7 +387,7 @@
var result = mock(DexoptResult.class);
var cancellationSignal = new CancellationSignal();
- when(mDexOptHelper.dexopt(any(), deepEq(List.of(PKG_NAME)), same(params),
+ when(mDexoptHelper.dexopt(any(), deepEq(List.of(PKG_NAME)), same(params),
same(cancellationSignal), any()))
.thenReturn(result);
@@ -400,7 +400,7 @@
var result = mock(DexoptResult.class);
var cancellationSignal = new CancellationSignal();
- when(mDexOptHelper.dexopt(
+ when(mDexoptHelper.dexopt(
any(), deepEq(List.of(PKG_NAME)), any(), same(cancellationSignal), any()))
.thenReturn(result);
@@ -442,7 +442,7 @@
// It should use the default package list and params. The list is sorted by last active
// time in descending order.
doReturn(dexoptResult)
- .when(mDexOptHelper)
+ .when(mDexoptHelper)
.dexopt(any(), deepEq(List.of(PKG_NAME_SYS_UI, PKG_NAME)),
argThat(params -> params.getReason().equals("bg-dexopt")),
same(cancellationSignal), any(), any(), any());
@@ -452,7 +452,7 @@
.isSameInstanceAs(dexoptResult);
// Nothing to downgrade.
- verify(mDexOptHelper, never())
+ verify(mDexoptHelper, never())
.dexopt(any(), any(), argThat(params -> params.getReason().equals("inactive")),
any(), any(), any(), any());
}
@@ -470,7 +470,7 @@
// PKG_NAME should be dexopted.
doReturn(result)
- .when(mDexOptHelper)
+ .when(mDexoptHelper)
.dexopt(any(), inAnyOrder(PKG_NAME, PKG_NAME_SYS_UI),
argThat(params -> params.getReason().equals("bg-dexopt")), any(), any(),
any(), any());
@@ -479,7 +479,7 @@
null /* processCallbackExecutor */, null /* processCallback */);
// PKG_NAME should not be downgraded.
- verify(mDexOptHelper, never())
+ verify(mDexoptHelper, never())
.dexopt(any(), any(), argThat(params -> params.getReason().equals("inactive")),
any(), any(), any(), any());
}
@@ -497,14 +497,14 @@
// PKG_NAME should not be dexopted.
doReturn(result)
- .when(mDexOptHelper)
+ .when(mDexoptHelper)
.dexopt(any(), deepEq(List.of(PKG_NAME_SYS_UI)),
argThat(params -> params.getReason().equals("bg-dexopt")), any(), any(),
any(), any());
// PKG_NAME should be downgraded.
doReturn(result)
- .when(mDexOptHelper)
+ .when(mDexoptHelper)
.dexopt(any(), deepEq(List.of(PKG_NAME)),
argThat(params -> params.getReason().equals("inactive")), any(), any(),
any(), any());
@@ -520,7 +520,7 @@
lenient().when(mStorageManager.getAllocatableBytes(any())).thenReturn(999l);
// It should only dexopt system UI.
- when(mDexOptHelper.dexopt(
+ when(mDexoptHelper.dexopt(
any(), deepEq(List.of(PKG_NAME_SYS_UI)), any(), any(), any(), any(), any()))
.thenReturn(result);
@@ -530,7 +530,7 @@
.isSameInstanceAs(result);
// It should never downgrade apps, even if the storage is low.
- verify(mDexOptHelper, never())
+ verify(mDexoptHelper, never())
.dexopt(any(), any(), argThat(params -> params.getReason().equals("inactive")),
any(), any(), any(), any());
}
@@ -557,7 +557,7 @@
// It should use the overridden package list and params.
doReturn(result)
- .when(mDexOptHelper)
+ .when(mDexoptHelper)
.dexopt(any(), deepEq(List.of(PKG_NAME)), same(params), any(), any(), any(), any());
mArtManagerLocal.dexoptPackages(mSnapshot, "bg-dexopt", cancellationSignal,
@@ -565,7 +565,7 @@
// It should not downgrade PKG_NAME because it's in the overridden package list. It should
// not downgrade PKG_NAME_SYS_UI either because it's not an inactive package.
- verify(mDexOptHelper, never())
+ verify(mDexoptHelper, never())
.dexopt(any(), any(), argThat(params2 -> params2.getReason().equals("inactive")),
any(), any(), any(), any());
}
@@ -583,7 +583,7 @@
mArtManagerLocal.clearBatchDexoptStartCallback();
// It should use the default package list and params.
- when(mDexOptHelper.dexopt(any(), inAnyOrder(PKG_NAME, PKG_NAME_SYS_UI), not(same(params)),
+ when(mDexoptHelper.dexopt(any(), inAnyOrder(PKG_NAME, PKG_NAME_SYS_UI), not(same(params)),
same(cancellationSignal), any(), any(), any()))
.thenReturn(result);
diff --git a/libartservice/service/javatests/com/android/server/art/BackgroundDexoptJobTest.java b/libartservice/service/javatests/com/android/server/art/BackgroundDexoptJobTest.java
index 6f2e825..b6a0a81 100644
--- a/libartservice/service/javatests/com/android/server/art/BackgroundDexoptJobTest.java
+++ b/libartservice/service/javatests/com/android/server/art/BackgroundDexoptJobTest.java
@@ -78,7 +78,7 @@
@Mock private BackgroundDexoptJobService mJobService;
@Mock private JobParameters mJobParameters;
private Config mConfig;
- private BackgroundDexoptJob mBackgroundDexOptJob;
+ private BackgroundDexoptJob mBackgroundDexoptJob;
private Semaphore mJobFinishedCalled = new Semaphore(0);
@Before
@@ -96,8 +96,8 @@
lenient().when(mInjector.getConfig()).thenReturn(mConfig);
lenient().when(mInjector.getJobScheduler()).thenReturn(mJobScheduler);
- mBackgroundDexOptJob = new BackgroundDexoptJob(mInjector);
- lenient().when(BackgroundDexoptJobService.getJob()).thenReturn(mBackgroundDexOptJob);
+ mBackgroundDexoptJob = new BackgroundDexoptJob(mInjector);
+ lenient().when(BackgroundDexoptJobService.getJob()).thenReturn(mBackgroundDexoptJob);
lenient()
.doAnswer(invocation -> {
@@ -118,7 +118,7 @@
same(mSnapshot), eq(ReasonMapping.REASON_BG_DEXOPT), any(), any(), any()))
.thenReturn(mDexoptResult);
- Result result = Utils.getFuture(mBackgroundDexOptJob.start());
+ Result result = Utils.getFuture(mBackgroundDexoptJob.start());
assertThat(result).isInstanceOf(CompletedResult.class);
assertThat(((CompletedResult) result).dexoptResult()).isSameInstanceAs(mDexoptResult);
}
@@ -132,8 +132,8 @@
return mDexoptResult;
});
- Future<Result> future1 = mBackgroundDexOptJob.start();
- Future<Result> future2 = mBackgroundDexOptJob.start();
+ Future<Result> future1 = mBackgroundDexoptJob.start();
+ Future<Result> future2 = mBackgroundDexoptJob.start();
assertThat(future1).isSameInstanceAs(future2);
dexoptDone.release();
@@ -147,9 +147,9 @@
when(mArtManagerLocal.dexoptPackages(any(), any(), any(), any(), any()))
.thenReturn(mDexoptResult);
- Future<Result> future1 = mBackgroundDexOptJob.start();
+ Future<Result> future1 = mBackgroundDexoptJob.start();
Utils.getFuture(future1);
- Future<Result> future2 = mBackgroundDexOptJob.start();
+ Future<Result> future2 = mBackgroundDexoptJob.start();
Utils.getFuture(future2);
assertThat(future1).isNotSameInstanceAs(future2);
}
@@ -159,7 +159,7 @@
when(mArtManagerLocal.dexoptPackages(any(), any(), any(), any(), any()))
.thenThrow(IllegalStateException.class);
- Result result = Utils.getFuture(mBackgroundDexOptJob.start());
+ Result result = Utils.getFuture(mBackgroundDexoptJob.start());
assertThat(result).isInstanceOf(FatalErrorResult.class);
}
@@ -174,7 +174,7 @@
// The `start` method should ignore the system property. The system property is for
// `schedule`.
- Utils.getFuture(mBackgroundDexOptJob.start());
+ Utils.getFuture(mBackgroundDexoptJob.start());
}
@Test
@@ -188,8 +188,8 @@
return mDexoptResult;
});
- Future<Result> future = mBackgroundDexOptJob.start();
- mBackgroundDexOptJob.cancel();
+ Future<Result> future = mBackgroundDexoptJob.start();
+ mBackgroundDexoptJob.cancel();
dexoptCancelled.release();
Utils.getFuture(future);
}
@@ -199,7 +199,7 @@
var captor = ArgumentCaptor.forClass(JobInfo.class);
when(mJobScheduler.schedule(captor.capture())).thenReturn(JobScheduler.RESULT_SUCCESS);
- assertThat(mBackgroundDexOptJob.schedule()).isEqualTo(ArtFlags.SCHEDULE_SUCCESS);
+ assertThat(mBackgroundDexoptJob.schedule()).isEqualTo(ArtFlags.SCHEDULE_SUCCESS);
JobInfo jobInfo = captor.getValue();
assertThat(jobInfo.getIntervalMillis()).isEqualTo(BackgroundDexoptJob.JOB_INTERVAL_MS);
@@ -214,7 +214,7 @@
when(SystemProperties.getBoolean(eq("pm.dexopt.disable_bg_dexopt"), anyBoolean()))
.thenReturn(true);
- assertThat(mBackgroundDexOptJob.schedule())
+ assertThat(mBackgroundDexoptJob.schedule())
.isEqualTo(ArtFlags.SCHEDULE_DISABLED_BY_SYSPROP);
verify(mJobScheduler, never()).schedule(any());
@@ -230,7 +230,7 @@
var captor = ArgumentCaptor.forClass(JobInfo.class);
when(mJobScheduler.schedule(captor.capture())).thenReturn(JobScheduler.RESULT_SUCCESS);
- assertThat(mBackgroundDexOptJob.schedule()).isEqualTo(ArtFlags.SCHEDULE_SUCCESS);
+ assertThat(mBackgroundDexoptJob.schedule()).isEqualTo(ArtFlags.SCHEDULE_SUCCESS);
JobInfo jobInfo = captor.getValue();
assertThat(jobInfo.getIntervalMillis()).isEqualTo(BackgroundDexoptJob.JOB_INTERVAL_MS);
@@ -249,7 +249,7 @@
var captor = ArgumentCaptor.forClass(JobInfo.class);
when(mJobScheduler.schedule(captor.capture())).thenReturn(JobScheduler.RESULT_SUCCESS);
- assertThat(mBackgroundDexOptJob.schedule()).isEqualTo(ArtFlags.SCHEDULE_SUCCESS);
+ assertThat(mBackgroundDexoptJob.schedule()).isEqualTo(ArtFlags.SCHEDULE_SUCCESS);
JobInfo jobInfo = captor.getValue();
assertThat(jobInfo.isRequireBatteryNotLow()).isTrue();
@@ -260,12 +260,12 @@
mConfig.setScheduleBackgroundDexoptJobCallback(
Runnable::run, builder -> { builder.setRequiresStorageNotLow(true); });
- mBackgroundDexOptJob.schedule();
+ mBackgroundDexoptJob.schedule();
}
@Test
public void testUnschedule() {
- mBackgroundDexOptJob.unschedule();
+ mBackgroundDexoptJob.unschedule();
verify(mJobScheduler).cancel(anyInt());
}
@@ -275,7 +275,7 @@
when(mArtManagerLocal.dexoptPackages(any(), any(), any(), any(), any()))
.thenReturn(mDexoptResult);
- mBackgroundDexOptJob.onStartJob(mJobService, mJobParameters);
+ mBackgroundDexoptJob.onStartJob(mJobService, mJobParameters);
assertThat(mJobFinishedCalled.tryAcquire(TIMEOUT_SEC, TimeUnit.SECONDS)).isTrue();
verify(mJobService).jobFinished(any(), eq(false) /* wantsReschedule */);
@@ -286,7 +286,7 @@
when(mArtManagerLocal.dexoptPackages(any(), any(), any(), any(), any()))
.thenThrow(RuntimeException.class);
- mBackgroundDexOptJob.onStartJob(mJobService, mJobParameters);
+ mBackgroundDexoptJob.onStartJob(mJobService, mJobParameters);
assertThat(mJobFinishedCalled.tryAcquire(TIMEOUT_SEC, TimeUnit.SECONDS)).isTrue();
verify(mJobService).jobFinished(any(), eq(false) /* wantsReschedule */);
@@ -298,7 +298,7 @@
when(mArtManagerLocal.dexoptPackages(any(), any(), any(), any(), any()))
.thenReturn(mDexoptResult);
- mBackgroundDexOptJob.onStartJob(mJobService, mJobParameters);
+ mBackgroundDexoptJob.onStartJob(mJobService, mJobParameters);
assertThat(mJobFinishedCalled.tryAcquire(TIMEOUT_SEC, TimeUnit.SECONDS)).isTrue();
verify(mJobService).jobFinished(any(), eq(true) /* wantsReschedule */);
diff --git a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java b/libartservice/service/javatests/com/android/server/art/DexoptHelperTest.java
similarity index 97%
rename from libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
rename to libartservice/service/javatests/com/android/server/art/DexoptHelperTest.java
index 4f2e38c..eab54d4 100644
--- a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
+++ b/libartservice/service/javatests/com/android/server/art/DexoptHelperTest.java
@@ -73,7 +73,7 @@
@SmallTest
@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class DexOptHelperTest {
+public class DexoptHelperTest {
private static final String PKG_NAME_FOO = "com.example.foo";
private static final String PKG_NAME_BAR = "com.example.bar";
private static final String PKG_NAME_LIB1 = "com.example.lib1";
@@ -108,7 +108,7 @@
private Config mConfig;
private DexoptParams mParams;
private List<String> mRequestedPackages;
- private DexoptHelper mDexOptHelper;
+ private DexoptHelper mDexoptHelper;
@Before
public void setUp() throws Exception {
@@ -154,7 +154,7 @@
lenient().when(mInjector.getPowerManager()).thenReturn(mPowerManager);
lenient().when(mInjector.getConfig()).thenReturn(mConfig);
- mDexOptHelper = new DexoptHelper(mInjector);
+ mDexoptHelper = new DexoptHelper(mInjector);
}
@After
@@ -173,7 +173,7 @@
when(mInjector.getPrimaryDexopter(same(mPkgStateLibbaz), any(), any(), any()))
.thenReturn(failingPrimaryDexopter);
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getRequestedCompilerFilter()).isEqualTo("speed-profile");
@@ -242,7 +242,7 @@
| ArtFlags.FLAG_SHOULD_INCLUDE_DEPENDENCIES)
.build();
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getPackageDexoptResults()).hasSize(3);
@@ -265,7 +265,7 @@
| ArtFlags.FLAG_SHOULD_INCLUDE_DEPENDENCIES)
.build();
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getPackageDexoptResults()).hasSize(6);
@@ -294,7 +294,7 @@
| ArtFlags.FLAG_SHOULD_INCLUDE_DEPENDENCIES)
.build();
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getPackageDexoptResults()).hasSize(3);
@@ -315,7 +315,7 @@
return mPrimaryResults;
});
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getFinalStatus()).isEqualTo(DexoptResult.DEXOPT_CANCELLED);
@@ -345,7 +345,7 @@
when(mPkgFoo.getSplits().get(0).isHasCode()).thenReturn(false);
mRequestedPackages = List.of(PKG_NAME_FOO);
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getFinalStatus()).isEqualTo(DexoptResult.DEXOPT_SKIPPED);
@@ -361,7 +361,7 @@
when(mPkgLib1.getSplits().get(0).isHasCode()).thenReturn(false);
mRequestedPackages = List.of(PKG_NAME_FOO);
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getFinalStatus()).isEqualTo(DexoptResult.DEXOPT_PERFORMED);
@@ -377,7 +377,7 @@
lenient().when(mAhm.isHibernatingGlobally(PKG_NAME_FOO)).thenReturn(true);
mRequestedPackages = List.of(PKG_NAME_FOO);
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getFinalStatus()).isEqualTo(DexoptResult.DEXOPT_SKIPPED);
@@ -392,7 +392,7 @@
lenient().when(mAhm.isHibernatingGlobally(PKG_NAME_FOO)).thenReturn(true);
lenient().when(mAhm.isOatArtifactDeletionEnabled()).thenReturn(false);
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(result.getPackageDexoptResults()).hasSize(6);
@@ -415,7 +415,7 @@
when(mPrimaryDexopter.dexopt()).thenThrow(IllegalStateException.class);
try {
- mDexOptHelper.dexopt(
+ mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
} catch (Exception ignored) {
}
@@ -427,7 +427,7 @@
public void testDexoptPackageNotFound() throws Exception {
when(mSnapshot.getPackageState(any())).thenReturn(null);
- mDexOptHelper.dexopt(
+ mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
verifyNoDexopt();
@@ -437,7 +437,7 @@
public void testDexoptNoPackage() throws Exception {
lenient().when(mPkgStateFoo.getAndroidPackage()).thenReturn(null);
- mDexOptHelper.dexopt(
+ mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
verifyNoDexopt();
@@ -452,7 +452,7 @@
.setSplitName("split_0")
.build();
- mDexOptHelper.dexopt(
+ mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
}
@@ -466,7 +466,7 @@
.build();
assertThrows(IllegalArgumentException.class, () -> {
- mDexOptHelper.dexopt(
+ mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
});
}
@@ -481,7 +481,7 @@
mConfig.addDexoptDoneCallback(
false /* onlyIncludeUpdates */, Runnable::run, result -> list2.add(result));
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(list1).containsExactly(result);
@@ -500,7 +500,7 @@
mConfig.removeDexoptDoneCallback(callback1);
- DexoptResult result = mDexOptHelper.dexopt(
+ DexoptResult result = mDexoptHelper.dexopt(
mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor);
assertThat(list1).isEmpty();
@@ -553,9 +553,9 @@
.thenReturn(barPrimaryDexopter);
when(barPrimaryDexopter.dexopt()).thenReturn(totalFailureResults);
- DexoptResult resultWithSomeUpdates = mDexOptHelper.dexopt(mSnapshot,
+ DexoptResult resultWithSomeUpdates = mDexoptHelper.dexopt(mSnapshot,
List.of(PKG_NAME_FOO, PKG_NAME_BAR), mParams, mCancellationSignal, mExecutor);
- DexoptResult resultWithNoUpdates = mDexOptHelper.dexopt(
+ DexoptResult resultWithNoUpdates = mDexoptHelper.dexopt(
mSnapshot, List.of(PKG_NAME_BAR), mParams, mCancellationSignal, mExecutor);
assertThat(listAll).containsExactly(resultWithSomeUpdates, resultWithNoUpdates);
@@ -583,7 +583,7 @@
var progressCallbackExecutor = new DelayedExecutor();
Consumer<OperationProgress> progressCallback = mock(Consumer.class);
- mDexOptHelper.dexopt(mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor,
+ mDexoptHelper.dexopt(mSnapshot, mRequestedPackages, mParams, mCancellationSignal, mExecutor,
progressCallbackExecutor, progressCallback);
progressCallbackExecutor.runAll();