summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e411f74efe6dd383e59634760cccd96da1c209b': Add support for NETWORK_TYPE_GSM
| | * | | | | | | | | | | | | Add support for NETWORK_TYPE_GSMSandeep Kunta2014-05-012-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for NETWORK_TYPE_GSM in TelephonyManager and corresponding mapping in ServicState.java so that when application queries for getVoiceNetworkType() and currently camped rat is GSM, they get network mode as GSM instead of network mode unknown. Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
| * | | | | | | | | | | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-294-2/+543
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly ↵Gabriel Peal2014-03-224-2/+543
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported APIs that are not useful for 3rd party developers. * commit 'e05077d78c9abde054a754db53e71c647b9a705c': Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality ↵Wink Saville2014-04-262-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to handle ICC IO error" * commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d': Telephony: Add functionality to handle ICC IO error
| * | | | | | | | | | | | | | | am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC ↵Wink Saville2014-04-262-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IO error" * commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73': Telephony: Add functionality to handle ICC IO error
| | * | | | | | | | | | | | | | Merge "Telephony: Add functionality to handle ICC IO error"Wink Saville2014-04-252-2/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Telephony: Add functionality to handle ICC IO errorRakesh Pallerla2014-03-122-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present in Android all ICC Card states other than ICC PRESENT are treated as ICC ABSENT.Adding functionality to handle ICC IO error card state. Change-Id: I229bd80cb5e487f4345bef9fb7fee60850f085d9 Bug: 10643652
* | | | | | | | | | | | | | | | | Start collecting mobile radio activity from the radio.Dianne Hackborn2014-04-242-52/+62
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hook in to the new radio API to find out when the radio is active and use that to track its state in batter stats. We also still have the data being tracked from the kernel's emulation, and continue to use that if we don't get data from the radio. Currently this monitoring is turned off until some issues in the radio can be fixed that are providing bad data. Also add a new API to get estimated drain and charge times. Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
* | | | | | | | | | | | | | | | Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen eventWink Saville2014-04-155-1/+195
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added DataConnectionRealTimeInfo structure which passed as a parameter to onDataConnectionRealTimeInfoChanged. Change-Id: Iadcbf9765af57c125bcdf74e3fc652ed6c8f7d42
* | | | | | | | | | | | | | | Correct some comments (LTE->CDMA)Brian Williammee2014-04-111-2/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change references to LTE in CellSignalStrengthCdma to CDMA. Change-Id: I2c003746dcef84949af69e2fbd4e5db4906e1125
* | | | | | | | | | | | | | am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call ↵Anders Kristensen2014-03-281-0/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnect codes." * commit '7bce23f733cfaa1028e553852ff7762d7b32a893': Remove duplicate call disconnect codes.
| * | | | | | | | | | | | am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."Anders Kristensen2014-03-281-0/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aee03bb1a1077427c918ad9fea5fdd1ab204f60e': Remove duplicate call disconnect codes.
| | * | | | | | | | | | | Remove duplicate call disconnect codes.Anders Kristensen2014-03-051-0/+85
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android code base defines call disconnect codes in three places: - android.telephony.DisconnectCause - android.internal.telephony.Connection.DisconnectCause - com.android.services.telephony.common.Call.DisconnectCause This CL consolidates the code to use the integer codes from android.telephony.DisconnectCause everywhere. Change-Id: I84a3fd5182a51d07fc7d81076e4b2c15ff26c61c
| * | | | | | | | | | | am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that ↵Gabriel Peal2014-03-254-2/+543
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes explicitly supported APIs that are not useful for 3rd party developers. * commit '8ee4491dc80943429cd79d0c7b87c28056067a58': Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
| | * | | | | | | | | | am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly ↵Gabriel Peal2014-03-254-2/+543
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported APIs that are not useful for 3rd party developers. * commit 'e05077d78c9abde054a754db53e71c647b9a705c': Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
| | | * | | | | | | | | Added a private apis jar that includes explicitly supported APIs that are ↵Gabriel Peal2014-03-224-2/+543
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not useful for 3rd party developers. The first set of these APIs is for telephony: Added some APIs to ITelephony and created a first party framework for them toggleHold() merge() mute(boolean mute) playDtmfTone(char digit, boolean timedShortCode) stopDtmfTone() swap() addListener(ITelephonyListener listener) removeListener(ITelephonyListener listener) Bug: 13302451 Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
* | | | | | | | | | | | resolved conflicts for merge of c1edfc2c to masterGabriel Peal2014-03-251-11/+0
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attempt 2 Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc
* | | | | | | | | | | resolved conflicts for merge of c1edfc2c to masterGabriel Peal2014-03-251-205/+136
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica42d8ac1552040f7ea2864ff529f5fc1470001b
* | | | | | | | | | resolved conflicts for merge of 74fb97de to masterGabriel Peal2014-03-254-2/+628
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a
* | | | | | | | | Add get/setPreferredNetworkType() for OMA DM client.Jake Hamby2014-03-032-0/+54
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add get/setPreferredNetworkType() commands for OMA DM client. Bug: 8847590 Change-Id: Ia898d712b90ec583d61efe7385a5a1844d8beff1
* | | | | | | | Remove unneeded new RIL command.Jake Hamby2014-02-243-37/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter. Also remove some accidentally added debug log lines. Bug: 12864208 Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
* | | | | | | | Delete Third Party Call APIsSailesh Nepal2014-02-186-409/+0
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Change-Id: I6121c53362804a228e0316a1666b5032817530ab
* | | | | | | am df10f02a: am e574f7de: am ea56c795: am bbba8211: Merge "Telephony: Handle ↵Wink Saville2014-02-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | DATA_CALL_LIST in DCC." * commit 'df10f02a1428e12acda695360a5e760c8e806ea2': Telephony: Handle DATA_CALL_LIST in DCC.
| * | | | | Merge "Telephony: Handle DATA_CALL_LIST in DCC."Wink Saville2014-02-131-0/+1
| |\ \ \ \ \
| | * | | | | Telephony: Handle DATA_CALL_LIST in DCC.Yashdev Singh2014-01-151-0/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added async handling of NetStatPoll. Bug: 11596853 Change-Id: Iffb7bf369062264dd773338c732bc69318d90b73
* | | | | | resolved conflicts for merge of 396b9e79 to masterNarayan Kamath2014-02-1311-0/+1167
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
| * | | | Merge "Telephony API extension v2"Wink Saville2014-02-1311-0/+1166
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Telephony API extension v2Antonio Marín Cerezuela2014-01-1011-0/+1166
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new AndroidManifest permission: android.permission.READ_PRECISE_PHONE_STATE Added the following PhoneStateListeners and corresponding broadcast intents: onPreciseCallStateChanged(PreciseCallState callState); onPreciseDataConnectionStateChanged(PreciseDataConnectionState dataConnectionState); broadcastPreciseCallStateChanged(int ringingCallState, int foregroundCallState, int backgroundCallState, int disconnectCause, int preciseDisconnectCause) broadcastPreciseDataConnectionStateChanged(int state, int networkType, String apnType, String apn, String reason, LinkProperties linkProperties, String failCause) Added TelephonyManager intent actions with their extras and constants: public static final String ACTION_PRECISE_CALL_STATE_CHANGED = "android.intent.action.PRECISE_CALL_STATE"; public static final String ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.PRECISE_DATA_CONNECTION_STATE_CHANGED"; public static final int PRECISE_CALL_STATE_* Moved public static final int DISCONNECT_CAUSE_* from PreciseCallState.java to a new class DisconnectCause.java Moved public static final int PRECISE_DISCONNECT_CAUSE_* from PreciseCallState.java to a new class PreciseDisconnectCause.java Change-Id: If3b88c679507c529b746046c4a17cf6d9974bd09
* | | | Add new RIL commands to read/write NV items and reset NV config.Jake Hamby2014-02-037-63/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new RIL commands and generic code cleanups. The only changes required for OMA DM support are the addition of five new methods in ITelephony.aidl for reading/writing NV items and performing NV config and radio resets (requires MODIFY_PHONE_STATE), along with the new RIL request IDs in RILConstants.java. Bug: 12864208 Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
* | | | am 9bc74c4b: am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge ↵Wink Saville2014-01-161-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "Fixed mistaken reference to "LTE". Bug 7637224" * commit '9bc74c4b20bc0c88d01b832517122c28439aa406': Fixed mistaken reference to "LTE". Bug 7637224
| * | | Fixed mistaken reference to "LTE".David Friedman2014-01-081-2/+2
| |/ / | | | | | | | | | | | | | | | Bug 7637224 Change-Id: I9c78fe6edd1182f8132cc5db9ecedbb69681b473
| * | Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEADThe Android Open Source Project2013-12-055-4/+54
| |\ \ | | |/ | | | | | | Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
* | | Merge "PhoneNumberUtils API changes"Yorke Lee2013-12-192-26/+19
|\ \ \
| * | | PhoneNumberUtils API changesYorke Lee2013-12-022-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unhide the following methods: PhoneNumberFormattingTextWatcher(String countryCode) formatNumber(String phoneNumber, String defaultCountryIso) formatNumber(String phoneNumber, String phoneNumberE164, String defaultCountryISO) formatNumberToE164(String phoneNumber, String defaultCountryIso) (The previous 3 formatting methods use an instance of PhoneNumberUtil to do the formatting) isLocalEmergencyNumber(String number, Context context) isVoicemailNumber(String number) replaceUnicodeDigits(String number) normalizeNumber(String phoneNumber) Deprecate the following methods. These formatting-related methods don't use PhoneNumberUtil to perform the formatting, and so are considered broken: formatNumber(String source) formatNumber(String source, int defaultFormattingType) getFormatTypeForLocale(Locale locale) formatNumber(Editable text, int defaultFormattingType) formatNanpNumber(Editable text) formatJapaneseNumber(Editable text) Change-Id: Ibf854092b7db05f7e3e9401cc909c9f1ed4997b0
* | | | Fixing build breakage due to: c4d41755d73ffe85d179d42a4f0c993b49303145Shishir Agrawal2013-12-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Mismatched @param in javadoc. Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
* | | | Adding support for SIM communication from Android over logical channels.Shishir Agrawal2013-12-122-1/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the folowing commands in ITelephony.aidl and TelephonyManager: - iccOpenLogicalChannel - iccCloseLogicalChannel - iccTransmitApduLogicalChannel Also add a new SIM_COMMUNICATION permission (maked as dangerous) to control access to the above commands. Change-Id: I89c08adc6f9738907e3b547c749f3cc61f300710
* | | | am 66a9ebfd: am c91c7b4b: am 2e12e052: Merge "RIL changes for supporting ↵John Huang2013-12-051-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | generic SIM communication." * commit '66a9ebfd2fba0b94d84c6bf7bf98b9db7f9fb3b3': RIL changes for supporting generic SIM communication.
| * | | am 2e12e052: Merge "RIL changes for supporting generic SIM communication."John Huang2013-12-041-0/+6
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit '2e12e0522641649d363a1c6ede9be9af235197fa': RIL changes for supporting generic SIM communication.
| | * RIL changes for supporting generic SIM communication.Shishir Agrawal2013-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the 4 new commands to RIL interface: - RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007) - RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007) - RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007) - RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007) Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
| | * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2211-42/+172
| | |\ | | | | | | | | | | | | Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
| | * | Fix typo for radio technologySungmin Choi2013-10-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I792517f4c3aa568b014d6c2bc0023ce5255f8abb
* | | | Remove unused imports from frameworks/base.John Spurlock2013-11-207-16/+0
| | | | | | | | | | | | | | | | Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
* | | | Add ThirdPartyCall APIs to masterSailesh Nepal2013-11-136-0/+412
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are APIs for the new ThirdPartyPhone feature. Note, these APIs can't actually be used yet on master for two reasons: - initiating a call from a 3rd party app isn't possible yet because the TelephonyManager APIs aren't being added to master. - the TeleService implementation of these APIs aren't being added to master. Also, these APIs will be removed and the final ones will be added once they're ready to be merged into master. Change-Id: Ie783290451da448a011f813983e55b12047b5d99
* | | Add PhoneNumberUtils method for CDMA SMS number formatting.Jake Hamby2013-11-041-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | For CDMA networks, convert "+" prefix to "011" if the home network is using the North American Numbering Plan (NANP). New method is only used for MO SMS messages. Bug: 11360679 Change-Id: I534e0322b566de3fb49d7333bfcf62cfbfafb78a
* | | Merge "Enhance pin/puk support" into klp-devWink Saville2013-10-252-0/+28
|\ \ \
| * | | Enhance pin/puk supportWink Saville2013-10-232-0/+28
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add supplyPinReportResult & supplyPukReportResult that returns the result code and attempts remaining. Display "Attempts remaining" in Keyguard Bug: 9928717 Change-Id: Ibad0635dd1375fabce11ba2b7b9f95f8868489e6
* | | Merge "Fix CountryDetector NPE" into klp-devJay Shrauner2013-10-212-4/+5
|\ \ \
| * | | Fix CountryDetector NPEJay Shrauner2013-10-212-4/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix CountryDetector NPE by calling CallerInfo.getCurrentCountryIso() which checks for potential nulls. Bug:11291034 Change-Id: I0a4412c432551c64ec30652d69636442653ee337
* | | Fix typo for radio technologySungmin Choi2013-10-211-1/+1
|/ / | | | | | | | | Bug: 11317677 Change-Id: I792517f4c3aa568b014d6c2bc0023ce5255f8abb