Merge "The main menu must not be set as a pending activity instance"
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.");
}