diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-02-26 20:02:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-26 20:02:34 +0000 |
| commit | ddcd1bab60773d4121e68083334d37792f4d4243 (patch) | |
| tree | 93cce8e2208213688606caf1c06904f1cf042519 | |
| parent | 7bd1850ed7a435614ea48bbc7fc1e07af44effd7 (diff) | |
| parent | 44cdef58c69e43c21014df7902156235bd0618f7 (diff) | |
| download | Stk-ddcd1bab60773d4121e68083334d37792f4d4243.tar.gz | |
Merge "The main menu must not be set as a pending activity instance"android-o-preview-1android-n-mr2-preview-2o-preview
| -rwxr-xr-x | src/com/android/stk/StkMenuActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ public class StkMenuActivity extends ListActivity implements View.OnCreateContex } } 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."); } |