Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip legacy BackgroundDexOptService unit tests when ART Service is in use." into udc-dev

Browse Source
This commit is contained in:
Martin Stjernholm
2023-03-22 10:37:18 +00:00
committed by Android (Google) Code Review
parent feba032951 a11521db8c
commit b234b657a1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/Installer.java
View File

@@ -1179,7 +1179,7 @@ public class Installer extends SystemService {
// TODO(b/260124949): Remove the legacy dexopt code paths, i.e. this exception and all code
// that may throw it.
public LegacyDexoptDisabledException() {
super("Invalid call to legacy dexopt installd method while ART Service is in use.");
super("Invalid call to legacy dexopt method while ART Service is in use.");
}
}

6
services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java
View File

@@ -47,6 +47,7 @@ import android.content.IntentFilter;
import android.os.HandlerThread;
import android.os.PowerManager;
import android.os.Process;
import android.os.SystemProperties;
import android.util.Log;
import com.android.internal.util.IndentingPrintWriter;
@@ -56,6 +57,7 @@ import com.android.server.pm.dex.DexManager;
import com.android.server.pm.dex.DexoptOptions;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -126,6 +128,10 @@ public final class BackgroundDexOptServiceUnitTest {
@Before
public void setUp() throws Exception {
// These tests are only applicable to the legacy BackgroundDexOptService and cannot be run
// when ART Service is enabled.
Assume.assumeFalse(SystemProperties.getBoolean("dalvik.vm.useartservice", false));
when(mInjector.getCallingUid()).thenReturn(Process.FIRST_APPLICATION_UID);
when(mInjector.getContext()).thenReturn(mContext);
when(mInjector.getDexOptHelper()).thenReturn(mDexOptHelper);