Merge "Merge "Insert missing breaks" into oc-dev am: 88db7b39cf" into oc-dev-plus-aosp (9e8ce104) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityMetricsLogger.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}