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

Commit 588d80a3 authored by Marco Loaiza's avatar Marco Loaiza Committed by Automerger Merge Worker
Browse files

Update deviceId from server process when activity is destroyed am: c75f33a2 

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



Change-Id: I5ccf4233a511792a9b18497fd90a7fa98befe5c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f86bcb0 c75f33a2

services/core/java/com/android/server/wm/WindowProcessController.java

+5 −6
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
    /** Whether {@link #mLastReportedConfiguration} is deferred by the cached state. */

    private volatile boolean mHasCachedConfiguration;



    private int mTopActivityDeviceId = Context.DEVICE_ID_DEFAULT;

    private int mLastTopActivityDeviceId = Context.DEVICE_ID_DEFAULT;

    /**

     * Registered {@link DisplayArea} as a listener to override config changes. {@code null} if not

     * registered.
@@ -1411,8 +1411,9 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
        // If deviceId for the top-activity changed, schedule passing it to the app process.

        boolean topActivityDeviceChanged = false;

        int deviceId = getTopActivityDeviceId();

        if (deviceId != mTopActivityDeviceId) {

        if (deviceId != mLastTopActivityDeviceId) {

            topActivityDeviceChanged = true;

            mLastTopActivityDeviceId = deviceId;

        }



        final Configuration config = getConfiguration();
@@ -1431,15 +1432,13 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
            return;

        }



        // TODO(b/263402938): Add tests that capture the deviceId dispatch to the client.

        mTopActivityDeviceId = deviceId;

        dispatchConfiguration(config, topActivityDeviceChanged ? mTopActivityDeviceId

        dispatchConfiguration(config, topActivityDeviceChanged ? mLastTopActivityDeviceId

                : Context.DEVICE_ID_INVALID);

    }



    private int getTopActivityDeviceId() {

        ActivityRecord topActivity = getTopNonFinishingActivity();

        int updatedDeviceId = mTopActivityDeviceId;

        int updatedDeviceId = Context.DEVICE_ID_DEFAULT;

        if (topActivity != null && topActivity.mDisplayContent != null) {

            updatedDeviceId = mAtm.mTaskSupervisor.getDeviceIdForDisplayId(

                    topActivity.mDisplayContent.mDisplayId);