From 453cae3692579c787d855615a5bb2a8f9c57d907 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 16 Mar 2017 15:41:40 +0100
Subject: [PATCH] Protect against weird null case

No time to figure out what's going on, but this null check helps

Test: Dock app, make fullscreen, hammer home button
Change-Id: I3eb94a8138bc1483b1711556696bcbbaee6084e7
Bug: 36339388
---
 .../core/java/com/android/server/am/ActivityMetricsLogger.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityMetricsLogger.java b/services/core/java/com/android/server/am/ActivityMetricsLogger.java
index ebbce0227b3e8..918747b370767 100644
--- a/services/core/java/com/android/server/am/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/am/ActivityMetricsLogger.java
@@ -251,7 +251,8 @@ class ActivityMetricsLogger {
      *                       ActivityManagerInternal.APP_TRANSITION_* reasons.
      */
     void notifyTransitionStarting(SparseIntArray stackIdReasons) {
-        if (!isAnyTransitionActive() || mLoggedTransitionStarting) {
+        // TODO (b/36339388): Figure out why stackIdReasons can be null
+        if (stackIdReasons == null || !isAnyTransitionActive() || mLoggedTransitionStarting) {
             return;
         }
         mCurrentTransitionDelayMs = calculateCurrentDelay();