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

Merge "Send app transition starting event at right time" into oc-dr1-dev

Browse Source 
am: 790e3ff6e3

Change-Id: Iadada99fc926de016dc78b1a82270ceda5039066
This commit is contained in:
Jorim Jaggi
2017-07-19 11:52:02 +00:00
committed by android-build-merger
parent be7dea4f81 790e3ff6e3
commit 2eb38600c4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,7 @@ class WindowSurfacePlacer {
*/ */
int handleAppTransitionReadyLocked() { int handleAppTransitionReadyLocked() {
int appsCount = mService.mOpeningApps.size(); int appsCount = mService.mOpeningApps.size();
if (!transitionGoodToGo(appsCount)) { if (!transitionGoodToGo(appsCount, mTempTransitionReasons)) {
return 0; return 0;
} }
Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "AppTransitionReady"); Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "AppTransitionReady");
@@ -375,6 +375,9 @@ class WindowSurfacePlacer {
true /*updateInputWindows*/); true /*updateInputWindows*/);
mService.mFocusMayChange = false; mService.mFocusMayChange = false;
mService.mH.obtainMessage(NOTIFY_APP_TRANSITION_STARTING,
mTempTransitionReasons.clone()).sendToTarget();
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
return layoutRedo | FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_CONFIG; return layoutRedo | FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_CONFIG;
@@ -499,7 +502,7 @@ class WindowSurfacePlacer {
} }
} }
private boolean transitionGoodToGo(int appsCount) { private boolean transitionGoodToGo(int appsCount, SparseIntArray outReasons) {
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
"Checking " + appsCount + " opening apps (frozen=" "Checking " + appsCount + " opening apps (frozen="
+ mService.mDisplayFrozen + " timeout=" + mService.mDisplayFrozen + " timeout="
@@ -508,7 +511,7 @@ class WindowSurfacePlacer {
mService.mAnimator.getScreenRotationAnimationLocked( mService.mAnimator.getScreenRotationAnimationLocked(
Display.DEFAULT_DISPLAY); Display.DEFAULT_DISPLAY);
final SparseIntArray reasons = mTempTransitionReasons; outReasons.clear();
if (!mService.mAppTransition.isTimeout()) { if (!mService.mAppTransition.isTimeout()) {
// Imagine the case where we are changing orientation due to an app transition, but a previous // Imagine the case where we are changing orientation due to an app transition, but a previous
// orientation change is still in progress. We won't process the orientation change // orientation change is still in progress. We won't process the orientation change
@@ -542,10 +545,10 @@ class WindowSurfacePlacer {
final TaskStack stack = wtoken.getStack(); final TaskStack stack = wtoken.getStack();
final int stackId = stack != null ? stack.mStackId : INVALID_STACK_ID; final int stackId = stack != null ? stack.mStackId : INVALID_STACK_ID;
if (allDrawn) { if (allDrawn) {
reasons.put(stackId, drawnBeforeRestoring ? APP_TRANSITION_WINDOWS_DRAWN outReasons.put(stackId, drawnBeforeRestoring ? APP_TRANSITION_WINDOWS_DRAWN
: APP_TRANSITION_SAVED_SURFACE); : APP_TRANSITION_SAVED_SURFACE);
} else { } else {
reasons.put(stackId, wtoken.startingData instanceof SplashScreenStartingData outReasons.put(stackId, wtoken.startingData instanceof SplashScreenStartingData
? APP_TRANSITION_SPLASH_SCREEN ? APP_TRANSITION_SPLASH_SCREEN
: APP_TRANSITION_SNAPSHOT); : APP_TRANSITION_SNAPSHOT);
} }
@@ -569,13 +572,10 @@ class WindowSurfacePlacer {
boolean wallpaperReady = !mWallpaperControllerLocked.isWallpaperVisible() || boolean wallpaperReady = !mWallpaperControllerLocked.isWallpaperVisible() ||
mWallpaperControllerLocked.wallpaperTransitionReady(); mWallpaperControllerLocked.wallpaperTransitionReady();
if (wallpaperReady) { if (wallpaperReady) {
mService.mH.obtainMessage(NOTIFY_APP_TRANSITION_STARTING, reasons.clone())
.sendToTarget();
return true; return true;
} }
return false; return false;
} }
mService.mH.obtainMessage(NOTIFY_APP_TRANSITION_STARTING, reasons.clone()).sendToTarget();
return true; return true;
} }