author | Chuck Lee <chulee@mozilla.com> |
Mon, 28 Jan 2013 10:44:13 +0800 | |
changeset 120311 | ecede220333ae1b2e114074b09d759f93b1bdf79 |
parent 120310 | 64b519b7fddf27f132103272090b687569905a04 |
child 120312 | 3125ccd01edb70257952f0a84ffa101a81ef6746 |
push id | 22148 |
push user | yhuang@mozilla.com |
push date | Wed, 30 Jan 2013 02:31:52 +0000 |
treeherder | mozilla-inbound@3125ccd01edb [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | yoshi |
bugs | 831627 |
milestone | 21.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/system/gonk/ril_consts.js +++ b/dom/system/gonk/ril_consts.js @@ -902,16 +902,21 @@ this.STK_TERMINAL_SUPPORT_PROACTIVE_SET_ this.STK_TERMINAL_SUPPORT_EVENT_MT_CALL = 1; this.STK_TERMINAL_SUPPORT_EVENT_CALL_CONNECTED = 1; this.STK_TERMINAL_SUPPORT_EVENT_CALL_DISCONNECTED = 1; this.STK_TERMINAL_SUPPORT_EVENT_LOCATION_STATUS = 1; this.STK_TERMINAL_SUPPORT_EVENT_USER_ACTIVITY = 0; this.STK_TERMINAL_SUPPORT_EVENT_IDLE_SCREEN_AVAILABLE = 1; this.STK_TERMINAL_SUPPORT_EVENT_CARD_READER_STATUS = 0; +this.STK_TERMINAL_SUPPORT_EVENT_LANGUAGE_SELECTION = 1; +this.STK_TERMINAL_SUPPORT_EVENT_BROWSER_TERMINATION = 0; +this.STK_TERMINAL_SUPPORT_EVENT_DATA_AVAILABLE = 0; +this.STK_TERMINAL_SUPPORT_EVENT_CHANNEL_STATUS = 0; + this.STK_TERMINAL_SUPPORT_PROACTIVE_TIMER_START_STOP = 1; this.STK_TERMINAL_SUPPORT_PROACTIVE_TIMER_GET_CURRENT = 1; this.STK_TERMINAL_SUPPORT_PROACTIVE_LOCAL_INFO_DATE = 1; this.STK_TERMINAL_SUPPORT_GET_INKEY = 1; this.STK_TERMINAL_SUPPORT_SET_UP_IDLE_MODE_TEXT = 1; this.STK_TERMINAL_SUPPORT_RUN_AT_COMMAND = 0; this.STK_TERMINAL_SUPPORT_SET_UP_CALL = 1; this.STK_TERMINAL_SUPPORT_CALL_CONTROL_BY_NNA = 0; @@ -920,16 +925,21 @@ this.STK_TERMINAL_SUPPORT_DISPLAY_TEXT this.STK_TERMINAL_SUPPORT_SEND_DTMF_COMMAND = 1; this.STK_TERMINAL_SUPPORT_PROACTIVE_LOCAL_INFO_NMR = 0; this.STK_TERMINAL_SUPPORT_PROACTIVE_LOCAL_INFO_LANGUAGE = 1; this.STK_TERMINAL_SUPPORT_PROACTIVE_LOCAL_INFO_TIME_ADVANCE = 0; this.STK_TERMINAL_SUPPORT_PROACTIVE_LANGUAGE_NOTIFICATION = 0; this.STK_TERMINAL_SUPPORT_PROACTIVE_LAUNCH_BROWSER = 1; this.STK_TERMINAL_SUPPORT_PROACTIVE_LOCAL_INFO_ACCESS_TECH = 0; +/** + * SAT profile + * + * @see ETSI TS 101.267, section 5.2. + */ this.STK_TERMINAL_PROFILE_DOWNLOAD = (STK_TERMINAL_SUPPORT_PROFILE_DOWNLOAD << 0) | (STK_TERMINAL_SUPPORT_SMS_PP_DOWNLOAD << 1) | (STK_TERMINAL_SUPPORT_CELL_BROADCAST_DATA_DOWNLOAD << 2) | (STK_TERMINAL_SUPPORT_MENU_SELECTION << 3) | (STK_TERMINAL_SUPPORT_SIM_DATA_DOWNLOAD_ERROR << 4) | (STK_TERMINAL_SUPPORT_TIMER_EXPIRATION << 5) | (STK_TERMINAL_SUPPORT_USSD_IN_CALL_CONTROL << 6) | @@ -970,16 +980,22 @@ this.STK_TERMINAL_PROFILE_EVENT = (STK_TERMINAL_SUPPORT_EVENT_MT_CALL << 1) | (STK_TERMINAL_SUPPORT_EVENT_CALL_CONNECTED << 2) | (STK_TERMINAL_SUPPORT_EVENT_CALL_DISCONNECTED << 3) | (STK_TERMINAL_SUPPORT_EVENT_LOCATION_STATUS << 4) | (STK_TERMINAL_SUPPORT_EVENT_USER_ACTIVITY << 5) | (STK_TERMINAL_SUPPORT_EVENT_IDLE_SCREEN_AVAILABLE << 6) | (STK_TERMINAL_SUPPORT_EVENT_CARD_READER_STATUS << 7); +this.STK_TERMINAL_PROFILE_EVENT_EXT = + (STK_TERMINAL_SUPPORT_EVENT_LANGUAGE_SELECTION << 0) | + (STK_TERMINAL_SUPPORT_EVENT_BROWSER_TERMINATION << 1) | + (STK_TERMINAL_SUPPORT_EVENT_DATA_AVAILABLE << 2) | + (STK_TERMINAL_SUPPORT_EVENT_CHANNEL_STATUS << 3); + this.STK_TERMINAL_PROFILE_PROACTIVE_3 = (STK_TERMINAL_SUPPORT_PROACTIVE_TIMER_START_STOP << 0) | (STK_TERMINAL_SUPPORT_PROACTIVE_TIMER_GET_CURRENT << 1) | (STK_TERMINAL_SUPPORT_PROACTIVE_LOCAL_INFO_DATE << 2) | (STK_TERMINAL_SUPPORT_GET_INKEY << 3) | (STK_TERMINAL_SUPPORT_SET_UP_IDLE_MODE_TEXT << 4) | (STK_TERMINAL_SUPPORT_RUN_AT_COMMAND << 5) | (STK_TERMINAL_SUPPORT_SET_UP_CALL << 6) | @@ -996,17 +1012,17 @@ this.STK_TERMINAL_PROFILE_PROACTIVE_4 = (STK_TERMINAL_SUPPORT_PROACTIVE_LOCAL_INFO_ACCESS_TECH << 7); this.STK_SUPPORTED_TERMINAL_PROFILE = [ STK_TERMINAL_PROFILE_DOWNLOAD, STK_TERMINAL_PROFILE_OTHER, STK_TERMINAL_PROFILE_PROACTIVE_1, STK_TERMINAL_PROFILE_PROACTIVE_2, STK_TERMINAL_PROFILE_EVENT, - 0x00, // Event extension + STK_TERMINAL_PROFILE_EVENT_EXT, // Event extension 0x00, // Multiple card proactive commands STK_TERMINAL_PROFILE_PROACTIVE_3, STK_TERMINAL_PROFILE_PROACTIVE_4, 0x00, // Softkey support 0x00, // Softkey information 0x00, // BIP proactive commands 0x00, // BIP supported bearers 0x00, // Screen height