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

Commit e817fe7b authored by Chris Li's avatar Chris Li
Browse files

Clean up activityWindowInfoFlag (1/n) 

Bug: 287582673
Test: cleanup, pass exisitng tests
Flag: EXEMPT flag cleanup
Change-Id: I643bacbadc80904c126a96dbd9929782e0bd39ff
parent bbb65363

core/java/android/app/ActivityThread.java

+0 −4
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import static android.window.ConfigurationHelper.shouldUpdateResources; 
import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;

import static com.android.internal.os.SafeZipPathValidatorCallback.VALIDATE_ZIP_PATH_FOR_PATH_TRAVERSAL;

import static com.android.sdksandbox.flags.Flags.sandboxActivitySdkBasedContext;

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



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -6846,9 +6845,6 @@ public final class ActivityThread extends ClientTransactionHandler 
    }



    private void handleActivityWindowInfoChanged(@NonNull ActivityClientRecord r) {

        if (!activityWindowInfoFlag()) {

            return;

        }

        if (r.mActivityWindowInfo.equals(r.mLastReportedActivityWindowInfo)) {

            return;

        }

core/java/android/app/servertransaction/ClientTransactionListenerController.java

+0 −11
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package android.app.servertransaction; 
import static android.app.WindowConfiguration.areConfigurationsEqualForDisplay;

import static android.view.Display.INVALID_DISPLAY;



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



import static java.util.Objects.requireNonNull;



import android.annotation.NonNull;
@@ -102,9 +100,6 @@ public class ClientTransactionListenerController { 
     */

    public void registerActivityWindowInfoChangedListener(

            @NonNull BiConsumer<IBinder, ActivityWindowInfo> listener) {

        if (!activityWindowInfoFlag()) {

            return;

        }

        synchronized (mLock) {

            mActivityWindowInfoChangedListeners.add(listener);

        }
@@ -116,9 +111,6 @@ public class ClientTransactionListenerController { 
     */

    public void unregisterActivityWindowInfoChangedListener(

            @NonNull BiConsumer<IBinder, ActivityWindowInfo> listener) {

        if (!activityWindowInfoFlag()) {

            return;

        }

        synchronized (mLock) {

            mActivityWindowInfoChangedListeners.remove(listener);

        }
@@ -130,9 +122,6 @@ public class ClientTransactionListenerController { 
     */

    public void onActivityWindowInfoChanged(@NonNull IBinder activityToken,

            @NonNull ActivityWindowInfo activityWindowInfo) {

        if (!activityWindowInfoFlag()) {

            return;

        }

        final Object[] activityWindowInfoChangedListeners;

        synchronized (mLock) {

            if (mActivityWindowInfoChangedListeners.isEmpty()) {

core/java/android/view/ViewRootImpl.java

+1 −5
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ import static android.view.inputmethod.InputMethodEditorTraceProto.InputMethodCl 














import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;















import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;













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















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















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















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










@@ -1374,9 +1373,6 @@ public final class ViewRootImpl implements ViewParent,













     */















    public void setActivityConfigCallback(@Nullable ActivityConfigCallback callback) {















        mActivityConfigCallback = callback;













        if (!activityWindowInfoFlag()) {













            return;













        }















        if (callback == null) {















            mPendingActivityWindowInfo = null;















            mLastReportedActivityWindowInfo = null;










@@ -9360,7 +9356,7 @@ public final class ViewRootImpl implements ViewParent,



























            onClientWindowFramesChanged(mTmpFrames);



























            if (activityWindowInfoFlag() && mPendingActivityWindowInfo != null) {













            if (mPendingActivityWindowInfo != null) {















                final ActivityWindowInfo outInfo = mRelayoutResult.activityWindowInfo;















                if (outInfo != null) {















                    mPendingActivityWindowInfo.set(outInfo);

































core/java/android/window/TaskFragmentOrganizer.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -328,6 +328,7 @@ public class TaskFragmentOrganizer extends WindowOrganizer {













     * only occupies a portion of Task bounds.















     * @hide















     */













    // TODO(b/287582673): cleanup















    public boolean isActivityEmbedded(@NonNull IBinder activityToken) {















        try {















            return getController().isActivityEmbedded(activityToken);

































core/tests/coretests/src/android/app/activity/ActivityThreadTest.java



+0
−5




























Original line number
Diff line number
Diff line








@@ -25,8 +25,6 @@ import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType













import static android.view.Display.DEFAULT_DISPLAY;















import static android.view.Display.INVALID_DISPLAY;





























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





























import static com.google.common.truth.Truth.assertThat;































import static org.junit.Assert.assertEquals;










@@ -810,7 +808,6 @@ public class ActivityThreadTest {





























    @Test















    public void testActivityWindowInfoChanged_activityLaunch() {













        mSetFlagsRule.enableFlags(FLAG_ACTIVITY_WINDOW_INFO_FLAG);















        ClientTransactionListenerController.getInstance().registerActivityWindowInfoChangedListener(















                mActivityWindowInfoListener);

























@@ -825,7 +822,6 @@ public class ActivityThreadTest {





























    @Test















    public void testActivityWindowInfoChanged_activityRelaunch() {













        mSetFlagsRule.enableFlags(FLAG_ACTIVITY_WINDOW_INFO_FLAG);















        ClientTransactionListenerController.getInstance().registerActivityWindowInfoChangedListener(















                mActivityWindowInfoListener);


























@@ -866,7 +862,6 @@ public class ActivityThreadTest {





























    @Test















    public void testActivityWindowInfoChanged_activityConfigurationChanged() {













        mSetFlagsRule.enableFlags(FLAG_ACTIVITY_WINDOW_INFO_FLAG);















        ClientTransactionListenerController.getInstance().registerActivityWindowInfoChangedListener(















                mActivityWindowInfoListener);