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

Merge "Merge "Insert missing breaks" into oc-dev am: 88db7b39cf" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-04-24 19:13:21 +00:00
committed by Android (Google) Code Review
parent 388fb093be 21664ced2f
commit 9e8ce10496
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityMetricsLogger.java
View File

@@ -254,8 +254,7 @@ class ActivityMetricsLogger {
* ActivityManagerInternal.APP_TRANSITION_* reasons.
*/
void notifyTransitionStarting(SparseIntArray stackIdReasons) {
// TODO (b/36339388): Figure out why stackIdReasons can be null
if (stackIdReasons == null || !isAnyTransitionActive() || mLoggedTransitionStarting) {
if (!isAnyTransitionActive() || mLoggedTransitionStarting) {
return;
}
mCurrentTransitionDelayMs = calculateCurrentDelay();

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -5035,6 +5035,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (callback != null) {
callback.run();
}
break;
}
case NEW_ANIMATOR_SCALE: {
float scale = getCurrentAnimatorScale();
@@ -5087,6 +5088,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
}
}
break;
case UPDATE_DOCKED_STACK_DIVIDER: {
synchronized (mWindowMap) {
final DisplayContent displayContent = getDefaultDisplayContentLocked();
@@ -5104,6 +5106,7 @@ public class WindowManagerService extends IWindowManager.Stub
mWindowReplacementTimeouts.clear();
}
}
break;
case NOTIFY_APP_TRANSITION_STARTING: {
mAmInternal.notifyAppTransitionStarting((SparseIntArray) msg.obj);
}