commit f970410afef518003c84eef022194848b2a4f606
author Jorim Jaggi <jjaggi@google.com> Thu May 05 19:14:22 2016 -0700
committer Jorim Jaggi <jjaggi@google.com> Fri May 06 17:21:36 2016 +0000
tree df2b1044a96c12c4b5a28274d2599727a3561332
parent 3273f31c40ce36010df9c6aa9324102bab9a2464

Don't crash the system when detecting a transient wrong state

Bug: 28616824
Change-Id: I124f7196d709c33fe70137541b650788af83b3b3

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 0331470..fe085d7 100644
--- a/services/core/java/com/android/server/am/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/am/ActivityMetricsLogger.java
@@ -5,12 +5,15 @@
 import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
 import static android.app.ActivityManager.StackId.HOME_STACK_ID;
 import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
 import static com.android.server.am.ActivityStack.STACK_INVISIBLE;
 
 import android.annotation.Nullable;
 import android.app.ActivityManager.StackId;
 import android.content.Context;
 import android.os.SystemClock;
+import android.util.Slog;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -19,6 +22,9 @@
  * Handles logging into Tron.
  */
 class ActivityMetricsLogger {
+
+    private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityMetricsLogger" : TAG_AM;
+
     // Window modes we are interested in logging. If we ever introduce a new type, we need to add
     // a value here and increase the {@link #TRON_WINDOW_STATE_VARZ_STRINGS} array.
     private static final int WINDOW_STATE_STANDARD = 0;
@@ -74,8 +80,9 @@
                 || stack.mStackId == FULLSCREEN_WORKSPACE_STACK_ID) {
             mWindowState = WINDOW_STATE_STANDARD;
         } else if (stack.mStackId == DOCKED_STACK_ID) {
-            throw new IllegalStateException("Docked stack shouldn't be the focused stack, "
-                    + "because it reported not being visible.");
+            Slog.wtf(TAG, "Docked stack shouldn't be the focused stack, because it reported not"
+                    + " being visible.");
+            mWindowState = WINDOW_STATE_INVALID;
         } else if (stack.mStackId == FREEFORM_WORKSPACE_STACK_ID) {
             mWindowState = WINDOW_STATE_FREEFORM;
         } else if (StackId.isStaticStack(stack.mStackId)) {