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

Commit 1d74c21f authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Make aosp-main-future in sync with goog/main

Flag: EXEMPT host test change only
Bug: 292141694
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: Ie9c5deb25ec5f8594feac15b2a3f41b40a65e4f0
parent b1b14414
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -112,10 +112,6 @@
      "name": "FrameworksInputMethodSystemServerTestsRavenwood",
      "host": true
    },
    {
      "name": "FrameworksMockingServicesTestsRavenwood",
      "host": true
    },
    {
      "name": "FrameworksServicesTestsRavenwood_Compat",
      "host": true
+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static org.junit.Assert.fail;
import android.content.Context;
import android.hardware.SerialManager;
import android.hardware.SerialManagerInternal;
import android.platform.test.annotations.DisabledOnRavenwood;
import android.platform.test.ravenwood.RavenwoodConfig;
import android.platform.test.ravenwood.RavenwoodConfig.Config;

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@

com.android.internal.ravenwood.*

com.android.server.FgThread
com.android.server.ServiceThread

com.android.internal.display.BrightnessSynchronizer
com.android.internal.util.ArrayUtils
com.android.internal.logging.MetricsLogger
@@ -371,4 +374,3 @@ android.app.compat.*
com.android.server.compat.*
com.android.internal.compat.*
android.app.AppCompatCallbacks