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

Commit 083adc2e authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Cleanup window_token_config_thread_safe" into main

parents 6dde954a a003ab4c

core/java/android/window/WindowTokenClient.java

+1 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ import static android.window.ConfigurationHelper.freeTextLayoutCachesIfNeeded; 
import static android.window.ConfigurationHelper.isDifferentDisplay;

import static android.window.ConfigurationHelper.shouldUpdateResources;



import static com.android.window.flags.Flags.windowTokenConfigThreadSafe;



import android.annotation.AnyThread;

import android.annotation.MainThread;

import android.annotation.NonNull;
@@ -146,7 +144,7 @@ public class WindowTokenClient extends Binder { 
        if (context == null) {

            return;

        }

        if (shouldReportConfigChange && windowTokenConfigThreadSafe()) {

        if (shouldReportConfigChange) {

            // Only report to ClientTransactionListenerController when shouldReportConfigChange.

            final ClientTransactionListenerController controller =

                    getClientTransactionListenerController();

core/java/android/window/flags/windowing_sdk.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -91,16 +91,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    namespace: "windowing_sdk"

    name: "window_token_config_thread_safe"

    description: "Ensure the Configuration pre/post changed is thread safe"

    bug: "334285008"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "always_defer_transition_when_apply_wct"

core/tests/coretests/src/android/app/servertransaction/ClientTransactionListenerControllerTest.java

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType 
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



import static com.android.window.flags.Flags.FLAG_BUNDLE_CLIENT_TRANSACTION_FLAG;

import static com.android.window.flags.Flags.FLAG_WINDOW_TOKEN_CONFIG_THREAD_SAFE;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -192,8 +191,6 @@ public class ClientTransactionListenerControllerTest { 


    @Test

    public void testWindowTokenClient_onConfigurationChanged() {

        mSetFlagsRule.enableFlags(FLAG_WINDOW_TOKEN_CONFIG_THREAD_SAFE);



        doNothing().when(mController).onContextConfigurationPreChanged(any());

        doNothing().when(mController).onContextConfigurationPostChanged(any());