summaryrefslogtreecommitdiff
path: root/src/com/android
AgeCommit message (Collapse)Author
2015-09-03Merge "Stk: Icon related changes" into mnc-dr-devAmit Mahajan
2015-09-03Stk: Icon related changesPreeti Ahuja
Return appropriate result code, if icon is not displayed and display text msg only if icon display fails or if icon is not self explanatory. BUG=22637125 Change-Id: If4b10f267cbbb1385701b0e97210d369f9e61cea
2015-09-01Correct handling of Launch Browser command.Preeti Ahuja
1) Stk: Create STK Default Url via System Property - Create a default url, specific to the STK module that can be set via a system property. - This url will be used when processing a launch browser proactive command that contains no url data associated with it. 2) Stk: Update Launch Browser If Not Already Launched Behavior - Since the default browser supports tabs, it will never be considered unavailable. Thus, there is no need to send a terminal response with a browser unavailable result code. - Suppress user confirmation when the browser mode is launch if not already launched and the alphaid is null or contains no text. BUG=22637280 Change-Id: I44cc1736da3f962cc5a6d7afd7b7f84d845fdb25
2015-07-10UICC: Destroy input activity when the terminal responose is sent.hoonsung.park
After get input command processing, ME can get the display text command result of input text. User select OK for display text command, then get input screen is remainging and user cannot exit the STK apk in this status. Thus input activity should be destoryed after terminal response. Bug: 22108748, 22217602 Change-Id: I120e35f71c665810d150403130e90d2266afe786
2015-06-02Remove user input from logcatCuihtlauac ALVARADO
Do not display text typed by the user in the radio logcat. (cherrypicked from commit 779121815ba9a08ae8a021c9ae4274ae43b01cb2) Change-Id: Ifeaa72009dbfe363f927d71af646633b67a329d3
2015-02-06STK: Check that main menu exists before retrievalandroid-5.1.1_r5lollipop-mr1-devw30234
Bug: 19282177 Change-Id: Ie47020d49abef0c2296b96e5b3a78445e6e44fb6
2015-01-16[DS] SIM Toolkit icon should not be shown if SIM don't support SIM ToolkitLegler Wu
1. Set StkMainActivity as default disabled 2. Only set StkMainActivity as enabled when receiving Setup menu from the SIM Bug: 18999216 Change-Id: I1b1233f478b67d008c042690e542e2d6158e34f1
2015-01-12STK: Accurate Terminal Response timer for StkDialogw30234
Bug: 18943616 Change-Id: I9c3ff78d38783e78bae47010ab2fc411e68e019d
2014-12-17Stk App bug fix and code refine.Legler Wu
Major changes: 1. StkAppService.java : line272~279: use getInstance(slotId)@CatService to get instance of cat service instead. line303~307: remove redundant codes line457~485: remove redundant codes line693~695: fix the NPE if the first proactive command is not SET_UP_MENU. line1109~1116: remove redundant codes. 2. StkMain.java (new file, is the launcher of Stk without UI(No_Display theme) : To fix a short flash problem when entering Stk app for one SIM inserted case. If inserted one SIM, it starts StkMenuActivity for showing main menu of the SIM. If inserted two SIMs, it starts StkLauncherActivity which shows a list for inserted SIMs. Bug: 18705342 Change-Id: If777f1cc0a16df38d1b534cd60ed7850b6072b22
2014-12-08Crash in Phone observed while launching SIM Toolkit appxinhe
This bug is due to the BOOT_COMPLETE propagate to the STK broadcast receiver too late. Instead, we listen to the USER_INITIALZE now. Bug:18607600 Change-Id: Iaf588797a75e9fcfabe78177df7d9270ae4e0ed9
2014-12-01Restore main menu after handling SETUP_CALL cmdw30234
Bug: 18238734 Change-Id: I7903fd1a11c0e0294d6f9dac0a9af855da023707
2014-12-01Add support for idle screen notificationPreeti Ahuja
When the device is not in an interactive state or when the screen off intent is received from the framework, we can assume that the screen is idle. Add support for idle screen available set up event list and event download. Handle normal priority and high priority display text correctly. Launch the Idle Mode Text when the idle screen notification is received. Bug: 18274506 Change-Id: Iff69fd8f998746a0fe37577b2bb63086478ef448
2014-12-01Stk: Handle Null Alpha Identifer for Setup CallPreeti Ahuja
- Per specification 102223 section 6.4.13: If the first alpha identifier is not provided by the UICC or is a null data object (ie. length is zero and has no value part) , the default setup call message is sent. Bug: 17646476 Change-Id: Ic978b262b41e8bd811fb87c2194830942594d5c8
2014-11-21STK: Remove dependency on idle screen notificationPreeti Ahuja
1. Remove support for Idle Screen available set up event list and event download. 2. Remove dependency of Set Up Idle Mode Text from idle screen notification. 3. Remove dependency of Display Text command from idle screen notification. Bug: 17553408 Change-Id: I2c46a3b2cbb7fb029518ffa738379447de64e373
2014-11-18Stk: These changes are related to DISPLAY Text pro cmdPreeti Ahuja
1. Handle high priority and normal priority display text command correctly. 2. For display text with immediate response, send the terminal response immediately after showing the text dialog. Block all responses from StkDialogActivity, if display text is with immediate response. Remove the check for response needed in StkAppService, since un wanted responses are already blocked in StkDialogActivity. 3. While the text is being displayed if a next Proactive command is received, it should be acted upon immediately. Bug: 17553408 Change-Id: I8dd74e0fb1434b0753cedfea2f2fcc1ba2f18067
2014-11-18Stk: Timer Related FixesPreeti Ahuja
Stk: Timer not getting cancelled after user response After user response, the timer should be cancelled. Else the timer would expire and sends an untimely Terminal response with RES_ID_TIMEOUT. Stk: StkDialog activity should not cancel timer when it is paused During display text, if any higher / lower priority events such as incoming call, new sms, screen off intent, notification alerts, user actions such as 'User moving to another activtiy' etc.. occur during Display Text ongoing session, this activity would receive 'onPause()' evt resulting in cancellation of the timer. As a result no terminal response is sent to the card Stk: StkMenu/StkInput activity should not cancel timer when paused During SelectItem / GetInkey / GetInput, if any higher / lower priority events such as incoming call, new sms, screen off intent,notification alerts, user actions such as 'User moving to another activtiy' etc.. occur during SELECT ITEM / GETINKEY / GETINPUT ongoing session respectively, the respective activity would receive 'onPause()' evt resulting in cancellation of the timer. As a result no terminal response is sent to the card Bug: 17553408 Change-Id: I0a214c037c3a53f65484104bb819c91bbea7fddd
2014-11-18Merge "Stk: Usat Phase 2 feature support" into lmp-mr1-devAmit Mahajan
2014-11-18Merge "Crash in Phone observed while launching SIM Toolkit app" into lmp-mr1-devxinhe
2014-11-18Stk: Usat Phase 2 feature supportPreeti Ahuja
This change combines the following fixes: 1) Usat Phase 2 feature support Added changes to support Idle screen, Language Selection. Fix Display Alpha for proactive commands 2) Fix to display dialog for DISPLAY_TEXT commands For Display Text commands that are low priority, we check the Idle Screen status before displaying the dialog. However, the handling for the result of the Idle Screen request is missing. Add this handling. 3) Fix crash on Idle Mode Text proactive command After checking for screen status, use the saved command object to process the Idle Mode Text command. 4) Stk: Update Manifest for modified Idle Screen Intent Update StkCmdReceiver's intent-filter to use the updated idle screen intent name 5) Stk: General Enhancements to StkAppService i) Support GET_CHANNEL_STATUS command ii)Set mMainCmd to null (SET_UP_MENU) only when we receive a remove menu command iii)Cleanup idlemode text code: Removed the intent extra SCREEN_STATUS_REQUEST which is no longer used (introduced in the change (3) above). 6) Handle LOCALE event properly Bug: 17553408 Change-Id: Ie9a52f62bb520650eec68e3209fab1dd6343fe1c
2014-11-18Crash in Phone observed while launching SIM Toolkit appxinhe
This APP should not be available for secondary user Bug:18224707 Change-Id: Iaa4201751ae181820398625188efd6ae87f4317a
2014-11-14STK: CC feature implementationPreeti Ahuja
Handle ALPHA_NOTIFY and display a toast mesage to user. Bug: 17646476 Change-Id: I44726cb4d124be4c088660faf9fe5bc8322ccea0
2014-10-20STK App DSDS supportWink Saville
Change-Id: I8d0a9ac406327fa91d78119df2953a417b4e4cb6
2014-09-25Help and End Session options do not show upw30234
Bug: 17553563 Change-Id: I2248204a6fec5c9666b177c4a216ca9d22737230
2014-08-27Colored notificationsSelim Cinek
Bug: 17128331 Change-Id: Icf1f7f980602a8056b9b61b7be33ce138fb882f1
2014-07-11Stk: Support for modem re-start and ICC refreshWink Saville
Uninstall the STK app, stop StkAppService and remove the idle text when StkAppService receives the CARD_ABSENT/CARD_ERROR status. IdleModeText and SETUP_MENU need to be cleared when a card refresh occurs. Bug: 12161291 Change-Id: I626ff5196270377d02c570703f46c5b272a115fd (cherry picked from commit f48e483b46cfec93edc70fa9e39c8a7120b864f8) (cherry picked from commit 8390bbbbfa8e170e81e8a99ab997fb1406d8e81a) (cherry picked from commit dc0f924d464dbc093f1168f0e9a8bca8b0aea73c)
2014-05-01DISPLAY TEXT clr msg after delay, expects result code OKJohannes Carlsson
Send RES_ID_TIMEOUT response if StkDialogActivity is sent to the background due to another acitivty has replaced it as forground activity. When a callback call interferes and closes the StkDialogActivity, the session still needs to be ended. If the session is not ended in a controlled way, STK will end up in a wrong state. If STK is in wrong state it will be unable to process subsequent callbacks. The sendResponse call is now moved to onStop() since it showed that the system will not call onDestroy() in some scenarios. This happened while repeating the test for 20 or more times. Change-Id: Ib6519ce15225b1c7be83251c6461fb14a4680200
2014-04-30Merge "Revert "Stk: Add Support for alpha in REFRESH command.""Wink Saville
2014-04-30Revert "Stk: Add Support for alpha in REFRESH command."Wink Saville
This reverts commit 38fe6a6cdb6b0a4c9ccf7040b82e4f08f7662833. Change-Id: Ib80556ba6981d06152e3c4a36504f6712a59ceac
2014-04-30Merge "Stk: Add Support for alpha in REFRESH command."Wink Saville
2014-04-24Set STK header if icon is null and selfexplanatoryPierre Fröjd
As per spec, if title icon is null and selfexplanatory the header should still be set. Header must be either an icon, default app name or a title text provided by the SIM. Change-Id: Ife3ee1b633dd94e818e8692fc6cdf6b53e92f0d1
2014-04-22Fix for play tone proactive command's wrong terminal responseLi Qiang
After an abort has been initiated using the MMI of the ME, the ME shall return a result of "Proactive UICC session terminated by the user". Change-Id: I7aa7e2a902e793e7e1235de6bfa7259f0010d17f
2014-03-28Special case for SAT Display TextChristopher Posselwhite
In the case where the SIM has required an immediate response the message should be shown forever to the user and removed only when one of the events specified in ETSI 102 223 §6.4.1 occurs. The implementation of this case has been corrected Change-Id: I17993542e1ba234a9e69b8162a9ae5271e176d07
2014-03-13Improve STK idle mode text handlingChristopher Posselwhite
The STK idle mode text was not shown as a ticker text in the idle mode screen, but only when you dragged down the notification bar to read the notification. Moreover, the text was shown without any title which made the context of this notification unclear. Now it shows the STK title text as specified by the SIM card. Change-Id: I0388bebad5d9da26e934a5552aa19d876cc5405c
2014-02-26stk: Add support of Help informationGuillaume Lucas
According to the 3GPP TS 31.124, Help information is an optional feature. If help information is set as supported, then the proactive command should support Help menu. If Help menu is supported but not available then conformance tests cases are considered as failed(eg: 27.22.4.8.2 sequence 2.1). This patch adds support for the optional feature - Help Info. Change-Id: I27412558853ff2f23b83a924e14efdf2de8d285f Author: Guillaume Lucas <guillaumex.lucas@intel.com> Signed-off-by: Guillaume Lucas <guillaumex.lucas@intel.com> Signed-off-by: Nizar Haouati <nizar.haouati@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 2883
2013-09-25STK: prevent to appear a home screen when DISPLAY_TEXTduho.ro
This patch changes the acvity flag as FLAG_ACTIVITY_CLEAR_TOP from FLAG_ACTIVITY_CLEAR_TASK. FLAG_ACTIVITY_CLEAR_TASK destroys all activities and creates a new activity. The home screen is displayed when DISPLAY_TEXT is occured and another STK activity is already performing. If FLAG_ACTIVITY_CLEAR_TOP is used, another STK activity is brought to foreground and then it is cleared. So, the home screen is not appeared. Bug: 10316520 Change-Id: I19a9fb37e091c30e0094b7734fbb5e406aae47f2
2013-09-23Stk: Add Support for alpha in REFRESH command.Suresh Koleti
RIL_UNSOL_STK_EVENT_NOTIFY is given by RIL in case there is alpha id to be displayed to user in refresh proactive cmd. Support is added to display Alpha id to user when this event comes due to REFRESH proactive cmd. Also if refresh mode is init or reset, idle mode text needs to be cleared as per stk 3GPP spec 11.14. This logic is handled in stk app to satisfy both the above requiremnts. Change-Id: Ic16da08d611753f2ee4a5b288f46b985078ca46f
2013-09-11Merge "Stk: Open Channel Fixes" into klp-devandroid-4.4_r0.7Wink Saville
2013-09-10STK : Fix STK input activity when rotated handsetduho.ro
When user is writing password in STK and then rotates the device, the password numbers are displaying. And STK send the unexpected Terminal Response to the UICC, so it causes wrong behavior. Bug: 10383311, 10382809 Change-Id: I2fbce28a73fa15183e45bfc85791d4b11612aa4b
2013-09-10Stk: Open Channel FixesSiddartha Pothapragada
StkAppService: Fix OPEN CHANNEL user confirmation -On receipt of OPEN CHANNEL , user confirmation needs to be set if user acknowledges the message / command. Stk: Show 'Toast indications' SEND DATA / RECV DATA and CLOSE CHANNEL - Displaying Toast indication yields better UI experience when there are multiple SEND / RCV DATA proactive commands in a single OPEN CHANNEL session. Bug: 10602211 Change-Id: Ib2ba51f9a41e875311e76943eae082d9e45f33c5
2013-09-10Merge "STK : Fix STK input activity when rotated handset"Wink Saville
2013-09-09STK : SIM Toolkit is not uninstalledduho.ro
SIM Toolkit apk(Stk) is not unistalled whend a device booted up after removed the SIM card. The CatService is not available during NO SIM status and the device can not uninstall Stk. Change-Id: I633c26551e1ae7e5230c1e68ce75fe6f6ca44dbb
2013-09-05Stk: Open Channel FixesSiddartha Pothapragada
StkAppService: Fix OPEN CHANNEL user confirmation -On receipt of OPEN CHANNEL , user confirmation needs to be set if user acknowledges the message / command. Stk: Show 'Toast indications' SEND DATA / RECV DATA and CLOSE CHANNEL - Displaying Toast indication yields better UI experience when there are multiple SEND / RCV DATA proactive commands in a single OPEN CHANNEL session. Bug: 10602211 Change-Id: Ib2ba51f9a41e875311e76943eae082d9e45f33c5
2013-09-03STK : Fix STK input activity when rotated handsetduho.ro
When user is writing password in STK and then rotates the device, the password numbers are displaying. And STK send the unexpected Terminal Response to the UICC, so it causes wrong behavior. Bug: 10383311, 10382809 Change-Id: I2fbce28a73fa15183e45bfc85791d4b11612aa4b
2013-03-11Merge "Fix to launch browser to home page"tools_r22Wink Saville
2013-03-04Fix to launch browser to home pageAbhishek Adappa
Certain STK commands don't provide a URL with which the browser should be launched. For those tests, launch the browser with the default homepage. Bug:8312291 Change-Id: Ie9799dbe7bd73e9deeea65832af2bf58a71488d6
2013-02-21Stk notifications has purple backgroundAlex Khlivnuik
Code was introduced in frameworks/base 96fd7c1c1acc03b40b1813ef65793560c175ef80 that makes notifications refering to status_bar_latest_event_content.xml directly show up in purple. Using internal resource directly is discouraged, or at least the author bids the user of this directly to have fun with the purple background. The recommended way is to use the class Notification.Builder (Api 11) to build your notifications. This commit uses Notification.Builder class which setup the correct notification layout and background. Change-Id: Idd850a16b7b68a40726a21947adc58cdcdfa1183
2013-02-20Dismiss Get In Key dialog after the timeout sent by the cardAbhishek Adappa
Don't use the default timeout for the dialog if the proactive command explicitly specifies one. Change-Id: I4e54d9e37ac6df832c4dcf93e6749eaff74756e1
2013-01-23Merge "StkAppSerice: Stop the service when CatService Instance is null"jb-mr1-dev-plus-aospWink Saville
2013-01-09Changed timeouts for StkChristopher.Posselwhite
The SIM Toolkit interface in Android uses one common timeout for UI commands. This is not good practice, as there is a very clear difference between use cases. A DISPLAY TEXT command with the option “clear after delay” and with option “Wait for user to clear” should not have the same timeout, which is the case without a patch. The timeouts have in the patch been set to 15 s for “clear after delay” (i.e. automatically removed), 60 seconds for “Wait for user to clear” and 30 s for other UI timeouts. The times are both in accordance with ETSI 102.223 and operator requirements. Change-Id: I61262bf36a84f071ec4f223eb187f92e2026b68b
2013-01-03Merge "Stk: Fix issue in DISPLAY TEXT-Sustained text"Wink Saville
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 00:00:04 +0000