diff options
| author | Jordan Liu <jminjie@google.com> | 2020-05-14 21:56:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-14 21:56:10 +0000 |
| commit | cb5cad32d6c19444a50988eb55322a94fe15f3b4 (patch) | |
| tree | 4a98b5e48b7587d56f3eb0de97c8f03e8b307e39 /src | |
| parent | fa9cfc1b09d390cc7bef388395c16eeaf88321c7 (diff) | |
| parent | a0bbc5e35ade636d9417a08c6183cd996f2a30ff (diff) | |
| download | Stk-cb5cad32d6c19444a50988eb55322a94fe15f3b4.tar.gz | |
Merge "Fix the incorrect title for DISPLAY TEXT dialog." am: 2296b3cb2b am: a0bbc5e35a
Change-Id: I1b08668e06dd1ae4d2400fc6c6f5da429045de2d
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/stk/StkAppService.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index 3ef3e0f..c78dbbe 100644 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -1085,13 +1085,6 @@ public class StkAppService extends Service implements Runnable { case DISPLAY_TEXT: TextMessage msg = cmdMsg.geTextMessage(); waitForUsersResponse = msg.responseNeeded; - if (mStkContext[slotId].lastSelectedItem != null) { - msg.title = mStkContext[slotId].lastSelectedItem; - } else if (mStkContext[slotId].mMainCmd != null){ - if (!getResources().getBoolean(R.bool.show_menu_title_only_on_menu)) { - msg.title = mStkContext[slotId].mMainCmd.getMenu().title; - } - } //If we receive a low priority Display Text and the device is // not displaying any STK related activity and the screen is not idle // ( that is, device is in an interactive state), then send a screen busy |