From 12bb956828d2df983baa0dad2523ab19b1a4577b Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Fri, 10 Jul 2015 15:25:38 -0700
Subject: [PATCH] Revert "Finish already paused activity if it should be
 finished after pausing"

This reverts commit bef8a3e39372ca85104b894f7359deddc97a8fec.

Changed caused some existing apps to crash. Reverting to unblock the
build while I investigate.

Bug: 22170595
Bug: 22397812
---
 services/core/java/com/android/server/am/ActivityStack.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 31cdcd51aff9e..8c3a9508922dc 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -2963,7 +2963,6 @@ final class ActivityStack {
         r.state = ActivityState.FINISHING;
 
         if (mode == FINISH_IMMEDIATELY
-                || (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED)
                 || prevState == ActivityState.STOPPED
                 || prevState == ActivityState.INITIALIZING) {
             // If this activity is already stopped, we can just finish