Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix stuck exiting windows" into pi-dev

Browse Source 
am: 65e2dda7f8

Change-Id: I95646a8488a7b08d79275b611196bafddd77fddb
This commit is contained in:
Jorim Jaggi
2018-03-16 15:02:47 +00:00
committed by android-build-merger
parent 3802114751 65e2dda7f8
commit a8f9417977
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -450,6 +450,12 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
if (isReallyAnimating()) {
delayed = true;
} else {
// We aren't animating anything, but exiting windows rely on the animation finished
// callback being called in case the AppWindowToken was pretending to be animating,
// which we might have done because we were in closing/opening apps list.
onAnimationFinished();
}
for (int i = mChildren.size() - 1; i >= 0 && !delayed; i--) {

2
services/core/java/com/android/server/wm/WindowSurfacePlacer.java
View File

@@ -454,7 +454,7 @@ class WindowSurfacePlacer {
AppWindowToken wtoken = mService.mOpeningApps.valueAt(i);
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Now opening app" + wtoken);
if (!wtoken.setVisibility(animLp, true, transit, false, voiceInteraction)){
if (!wtoken.setVisibility(animLp, true, transit, false, voiceInteraction)) {
// This token isn't going to be animating. Add it to the list of tokens to
// be notified of app transition complete since the notification will not be
// sent be the app window animator.

21
services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java
View File

@@ -20,6 +20,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import android.platform.test.annotations.Presubmit;
import android.support.test.filters.FlakyTest;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.view.Surface;
@@ -29,12 +30,14 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;
import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;
import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
import static android.view.WindowManager.TRANSIT_UNSET;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -43,7 +46,7 @@ import static org.junit.Assert.assertTrue;
* Tests for the {@link AppWindowToken} class.
*
* Build/Install/Run:
* bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
* atest FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
*/
@SmallTest
// TODO: b/68267650
@@ -231,4 +234,20 @@ public class AppWindowTokenTests extends WindowTestsBase {
mToken.finishRelaunching();
assertFalse(mToken.containsShowWhenLockedWindow() || mToken.containsDismissKeyguardWindow());
}
@Test
@FlakyTest(detail = "Promote once confirmed non-flaky")
public void testStuckExitingWindow() throws Exception {
final WindowState closingWindow = createWindow(null, FIRST_APPLICATION_WINDOW,
"closingWindow");
closingWindow.mAnimatingExit = true;
closingWindow.mRemoveOnExit = true;
closingWindow.mAppToken.setVisibility(null, false /* visible */, TRANSIT_UNSET,
true /* performLayout */, false /* isVoiceInteraction */);
// We pretended that we were running an exit animation, but that should have been cleared up
// by changing visibility of AppWindowToken
closingWindow.removeIfPossible();
assertTrue(closingWindow.mRemoved);
}
}