commit cf3105a9dd6197474f1e39d752f62254ca32223e
author Jiakai Zhang <jiakaiz@google.com> Tue Sep 06 13:45:32 2022 +0100
committer Jiakai Zhang <jiakaiz@google.com> Wed Sep 14 14:33:41 2022 +0000
tree f24640d32f5db40f5f7d9a433bc975e38af60fe1
parent 60b4318b0fd1e059693f1083c877f71d8c8399da

Change the OptimizeResult API to allow multiple packages.

The API has to handle the case where FLAG_SHOULD_INCLUDE_DEPENDENCIES is
set, in which case more than one package are optimized. Also, the class
can be reused as the result class for batch optimization (optimizing
multiple packages).

Bug: 245301593
Test: atest ArtServiceTests
Ignore-AOSP-First: ART Services.
Change-Id: I5c634e536c9dbdbaedf2f161cbde62467fb27e91

libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java

diff --git a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java b/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
index 518b972..3b4e045 100644
--- a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
+++ b/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
@@ -17,6 +17,7 @@
 package com.android.server.art;
 
 import static com.android.server.art.model.OptimizeResult.DexFileOptimizeResult;
+import static com.android.server.art.model.OptimizeResult.PackageOptimizeResult;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -109,11 +110,15 @@
         OptimizeResult result =
                 mDexOptHelper.dexopt(mock(PackageDataSnapshot.class), mPkgState, mPkg, mParams);
 
-        assertThat(result.getPackageName()).isEqualTo(PKG_NAME);
         assertThat(result.getRequestedCompilerFilter()).isEqualTo("speed-profile");
         assertThat(result.getReason()).isEqualTo("install");
         assertThat(result.getFinalStatus()).isEqualTo(OptimizeResult.OPTIMIZE_FAILED);
-        assertThat(result.getDexFileOptimizeResults()).containsExactlyElementsIn(mPrimaryResults);
+        assertThat(result.getPackageOptimizeResults()).hasSize(1);
+
+        PackageOptimizeResult packageResult = result.getPackageOptimizeResults().get(0);
+        assertThat(packageResult.getPackageName()).isEqualTo(PKG_NAME);
+        assertThat(packageResult.getDexFileOptimizeResults())
+                .containsExactlyElementsIn(mPrimaryResults);
 
         InOrder inOrder = inOrder(mPrimaryDexOptimizer, mWakeLock);
         inOrder.verify(mWakeLock).acquire(anyLong());
@@ -129,7 +134,7 @@
                 mDexOptHelper.dexopt(mock(PackageDataSnapshot.class), mPkgState, mPkg, mParams);
 
         assertThat(result.getFinalStatus()).isEqualTo(OptimizeResult.OPTIMIZE_SKIPPED);
-        assertThat(result.getDexFileOptimizeResults()).isEmpty();
+        assertThat(result.getPackageOptimizeResults().get(0).getDexFileOptimizeResults()).isEmpty();
     }
 
     @Test
@@ -140,7 +145,7 @@
                 mDexOptHelper.dexopt(mock(PackageDataSnapshot.class), mPkgState, mPkg, mParams);
 
         assertThat(result.getFinalStatus()).isEqualTo(OptimizeResult.OPTIMIZE_SKIPPED);
-        assertThat(result.getDexFileOptimizeResults()).isEmpty();
+        assertThat(result.getPackageOptimizeResults().get(0).getDexFileOptimizeResults()).isEmpty();
     }
 
     @Test
@@ -154,7 +159,8 @@
         OptimizeResult result =
                 mDexOptHelper.dexopt(mock(PackageDataSnapshot.class), mPkgState, mPkg, mParams);
 
-        assertThat(result.getDexFileOptimizeResults()).containsExactlyElementsIn(mPrimaryResults);
+        assertThat(result.getPackageOptimizeResults().get(0).getDexFileOptimizeResults())
+                .containsExactlyElementsIn(mPrimaryResults);
     }
 
     @Test