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

Commit 34aa8a61 authored by Makoto Onuki's avatar Makoto Onuki Committed by Gerrit Code Review
Browse files

Merge "Make aosp-main _mostly_ in sync with goog/main" into main

parents 87923b5c e2e8012f

ravenwood/TEST_MAPPING

+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

ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_nonself.java

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat; 


import android.app.Instrumentation;

import android.content.Context;

import android.platform.test.annotations.DisabledOnRavenwood;

import android.platform.test.ravenwood.RavenwoodConfig;

import android.platform.test.ravenwood.RavenwoodConfig.Config;
@@ -34,7 +33,7 @@ import org.junit.runner.RunWith; 
 * Tests for the case where the instrumentation target is _not_ the test APK itself.

 */

@RunWith(AndroidJUnit4.class)

@DisabledOnRavenwood(reason="AOSP is missing resources support")

@android.platform.test.annotations.DisabledOnRavenwood(reason = "AOSP is missing resources support")

public class RavenwoodInstrumentationTest_nonself {

    private static final String TARGET_PACKAGE_NAME =

            "com.android.ravenwood.bivalentinst_target_app";

ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_self.java

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat; 


import android.app.Instrumentation;

import android.content.Context;

import android.platform.test.annotations.DisabledOnRavenwood;

import android.platform.test.ravenwood.RavenwoodConfig;

import android.platform.test.ravenwood.RavenwoodConfig.Config;
@@ -34,7 +33,7 @@ import org.junit.runner.RunWith; 
 * Tests for the case where the instrumentation target is the test APK itself.

 */

@RunWith(AndroidJUnit4.class)

@DisabledOnRavenwood(reason="AOSP is missing resources support")

@android.platform.test.annotations.DisabledOnRavenwood(reason = "AOSP is missing resources support")

public class RavenwoodInstrumentationTest_self {



    private static final String TARGET_PACKAGE_NAME =

ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java

+2 −2
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;
@@ -70,7 +69,8 @@ public class RavenwoodServicesTest { 
    }



    @Test

    @DisabledOnRavenwood(reason="AOSP is missing resources support")

    @android.platform.test.annotations.DisabledOnRavenwood(

            reason = "AOSP is missing resources support")

    public void testSimple() {

        // Verify that we can obtain a manager, and talk to the backend service, and that no

        // serial ports are configured by default