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

Commit 0d4e74d5 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Send update config change when letterbox is moved"" into... 

Merge "Revert "Send update config change when letterbox is moved"" into udc-qpr-dev am: f44c4ffb am: 88c269c2

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



Change-Id: Ic14dca5587fc7dbdf75e4884bd12ae9ecec8d5a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 270a983d 88c269c2

core/java/android/app/ActivityThread.java

+0 −6
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import static android.view.Display.INVALID_DISPLAY; 
import static android.window.ConfigurationHelper.freeTextLayoutCachesIfNeeded;

import static android.window.ConfigurationHelper.isDifferentDisplay;

import static android.window.ConfigurationHelper.shouldUpdateResources;

import static android.window.ConfigurationHelper.shouldUpdateWindowMetricsBounds;



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

import static com.android.internal.os.SafeZipPathValidatorCallback.VALIDATE_ZIP_PATH_FOR_PATH_TRAVERSAL;
@@ -6163,11 +6162,6 @@ public final class ActivityThread extends ClientTransactionHandler 
    public static boolean shouldReportChange(@Nullable Configuration currentConfig,

            @NonNull Configuration newConfig, @Nullable SizeConfigurationBuckets sizeBuckets,

            int handledConfigChanges, boolean alwaysReportChange) {

        // Always report changes in window configuration bounds

        if (shouldUpdateWindowMetricsBounds(currentConfig, newConfig)) {

            return true;

        }



        final int publicDiff = currentConfig.diffPublicOnly(newConfig);

        // Don't report the change if there's no public diff between current and new config.

        if (publicDiff == 0) {

core/java/android/window/ConfigurationHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class ConfigurationHelper { 
     * @see WindowManager#getCurrentWindowMetrics()

     * @see WindowManager#getMaximumWindowMetrics()

     */

    public static boolean shouldUpdateWindowMetricsBounds(@NonNull Configuration currentConfig,

    private static boolean shouldUpdateWindowMetricsBounds(@NonNull Configuration currentConfig,

            @NonNull Configuration newConfig) {

        final Rect currentBounds = currentConfig.windowConfiguration.getBounds();

        final Rect newBounds = newConfig.windowConfiguration.getBounds();

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

+4 −2
Original line number Diff line number Diff line
@@ -472,8 +472,10 @@ public class ActivityThreadTest { 
        final Rect bounds = activity.getWindowManager().getCurrentWindowMetrics().getBounds();

        assertEquals(activityConfigPortrait.windowConfiguration.getBounds(), bounds);



        // Ensure changes in window configuration bounds are reported

        assertEquals(numOfConfig + 1, activity.mNumOfConfigChanges);

        // Ensure that Activity#onConfigurationChanged() not be called because the changes in

        // WindowConfiguration shouldn't be reported, and we only apply the latest Configuration

        // update in transaction.

        assertEquals(numOfConfig, activity.mNumOfConfigChanges);

    }



    @Test