commit d0535cfb4b3a75bf8b96a0201cc3b2d3bcddb8d7
author Ryuto Sawada <ryuto.x.sawada@sonymobile.com> Sun Feb 26 20:06:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Feb 26 20:06:44 2017 +0000
tree 8f0fda561267b86c68760b71b61126054a8dfa70
parent efdfdb1ff2d1916c5fcc20041e6786e95f563f84
parent ddcd1bab60773d4121e68083334d37792f4d4243

Merge "The main menu must not be set as a pending activity instance"
am: ddcd1bab60

Change-Id: I3a0f5f584758c2734c182d67f2b7b0373a40c010

src/com/android/stk/StkMenuActivity.java

diff --git a/src/com/android/stk/StkMenuActivity.java b/src/com/android/stk/StkMenuActivity.java
index 5c68e86..42cd60a 100755
--- a/src/com/android/stk/StkMenuActivity.java
+++ b/src/com/android/stk/StkMenuActivity.java
@@ -269,7 +269,9 @@
             }
         } else {
             if (appService != null) {
-                appService.getStkContext(mSlotId).setPendingActivityInstance(this);
+                if (mState == STATE_SECONDARY) {
+                    appService.getStkContext(mSlotId).setPendingActivityInstance(this);
+                }
             } else {
                 CatLog.d(LOG_TAG, "onStop: null appService.");
             }