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

Commit 613966ad authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Wait for relaunching activity to finish sync" into udc-dev am:... 

Merge "Wait for relaunching activity to finish sync" into udc-dev am: 94b48e8c am: a51ed207 am: c9ce7d97

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



Change-Id: If4fecfb9a0d4f61b771763f833cd1716dc7df765
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50247cee c9ce7d97

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

+1 −0
Original line number Diff line number Diff line
@@ -10608,6 +10608,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            return false;

        }

        if (!isVisibleRequested()) return true;

        if (mPendingRelaunchCount > 0) return false;

        // Wait for attach. That is the earliest time where we know if there will be an associated

        // display rotation. If we don't wait, the starting-window can finishDrawing first and

        // cause the display rotation to end-up in a following transition.

services/tests/wmtests/src/com/android/server/wm/SyncEngineTests.java

+17 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.times;
@@ -119,6 +120,22 @@ public class SyncEngineTests extends WindowTestsBase { 
        assertTrue(mockWC.onSyncFinishedDrawing());

        bse.onSurfacePlacement();

        verify(listener, times(1)).onTransactionReady(eq(id), notNull());



        // The sync is not finished for a relaunching activity.

        id = startSyncSet(bse, listener);

        final ActivityRecord r = new ActivityBuilder(mAtm).setCreateTask(true).build();

        final WindowState w = mock(WindowState.class);

        doReturn(true).when(w).isVisibleRequested();

        doReturn(true).when(w).fillsParent();

        doReturn(true).when(w).isSyncFinished(any());

        r.mChildren.add(w);

        bse.addToSyncSet(id, r);

        r.onSyncFinishedDrawing();

        assertTrue(r.isSyncFinished(r.getSyncGroup()));

        r.startRelaunching();

        assertFalse(r.isSyncFinished(r.getSyncGroup()));

        r.finishRelaunching();

        assertTrue(r.isSyncFinished(r.getSyncGroup()));

    }



    @Test