commit a0bbc5e35ade636d9417a08c6183cd996f2a30ff
author Jordan Liu <jminjie@google.com> Thu May 14 21:38:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 14 21:38:53 2020 +0000
tree 8e7a1f4a33b87174324b11360c4285f96456f99b
parent bcc9e0907c4785a09212b2df2b0cbde84ab9f1da
parent 2296b3cb2b35bf705018b902b08931e3b7c23d77

Merge "Fix the incorrect title for DISPLAY TEXT dialog." am: 2296b3cb2b

Change-Id: Ia7d01f117c287935282ddba8f07a07b6474c3d04

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index a1c59c0..3d23010 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -1094,13 +1094,6 @@
         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