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

Commit b5965b48 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "FrameworksCoreTests_all_binder" into main am: cc105341 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3381528



Change-Id: I2729108c17bde546f153e7dd7108414c3eb35967
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents abc6958e cc105341

core/java/com/android/internal/os/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
      "file_patterns": [

        "BinderDeathDispatcher\\.java"

      ],

      "name": "FrameworksCoreTests_internal_os_binder"

      "name": "FrameworksCoreTests_all_binder"

    },

    {

      "file_patterns": [

core/tests/coretests/Android.bp

+13 −2
Original line number Diff line number Diff line
@@ -523,14 +523,25 @@ test_module_config { 
}



test_module_config {

    name: "FrameworksCoreTests_internal_os_binder",

    name: "FrameworksCoreTests_all_binder",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],

    include_filters: ["com.android.internal.os.BinderDeathDispatcherTest"],

    include_filters: [

        "android.os.BinderProxyTest",

        "android.os.BinderDeathRecipientTest",

        "android.os.BinderFrozenStateChangeNotificationTest",

        "android.os.BinderProxyCountingTest",

        "android.os.BinderUncaughtExceptionHandlerTest",

        "android.os.BinderThreadPriorityTest",

        "android.os.BinderWorkSourceTest",

        "android.os.ParcelNullabilityTest",

        "android.os.ParcelTest",

        "com.android.internal.os.BinderDeathDispatcherTest",

    ],

    exclude_annotations: ["com.android.internal.os.SkipPresubmit"],

}

core/tests/coretests/src/android/os/BinderThreadPriorityTest.java

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.util.Log; 
import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.internal.os.SkipPresubmit;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;
@@ -131,6 +133,7 @@ public class BinderThreadPriorityTest { 
    }



    @Test

    @SkipPresubmit("b/381950874: bitrot and failed")

    public void testPassPriorityToService() throws Exception {

        for (int prio = 19; prio >= -20; prio--) {

            Process.setThreadPriority(prio);
@@ -146,6 +149,7 @@ public class BinderThreadPriorityTest { 
    }



    @Test

    @SkipPresubmit("b/381950874: bitrot and failed")

    public void testCallBackFromServiceWithPriority() throws Exception {

        for (int prio = -20; prio <= 19; prio++) {

            final int expected = prio;