commit c91c4be8330dc56677ff8d3be52ee64f4a4122af
author Jorim Jaggi <jjaggi@google.com> Thu Mar 16 15:41:40 2017 +0100
committer gitbuildkicker <android-build@google.com> Thu Mar 16 13:42:01 2017 -0700
tree dd4d168cc7f955e8602cdcaa6e5fe7c1e3a8aa3c
parent 88687cade532b28d949157e71f9715073d978ef9

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
(cherry picked from commit 453cae3692579c787d855615a5bb2a8f9c57d907)

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

diff --git a/services/core/java/com/android/server/am/ActivityMetricsLogger.java b/services/core/java/com/android/server/am/ActivityMetricsLogger.java
index ebbce02..918747b 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 @@
      *                       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();