2 years agoMerge "Initialize TestImsService with mock Context"
Brad Ebinger [Mon, 27 Feb 2017 21:25:43 +0000]
Merge "Initialize TestImsService with mock Context"
am: c4de1cb3b1

Change-Id: I9c9851b6751c88fefd7c13af09dd39efc7a1169c

2 years agoMerge "Initialize TestImsService with mock Context"
Brad Ebinger [Mon, 27 Feb 2017 21:19:16 +0000]
Merge "Initialize TestImsService with mock Context"

2 years agoMerge "Use empty string instead of null in setAllowedCarriers"
Amit Mahajan [Mon, 27 Feb 2017 18:49:28 +0000]
Merge "Use empty string instead of null in setAllowedCarriers"
am: fe403e0ca0

Change-Id: I782275868d499b6919e1b4b573e8e8b5ad7b9819

2 years agoMerge "Use empty string instead of null in setAllowedCarriers"
Treehugger Robot [Mon, 27 Feb 2017 18:43:03 +0000]
Merge "Use empty string instead of null in setAllowedCarriers"

2 years agoUse empty string instead of null in setAllowedCarriers
Amit Mahajan [Mon, 27 Feb 2017 17:09:25 +0000]
Use empty string instead of null in setAllowedCarriers

Test: Basic telephony sanity
Bug: 35374455
Change-Id: I59360e17836da540499aabdc9eee0401569aa726

2 years agoMerge "Format Japanese numbers using national format when in Japan."
Tyler Gunn [Mon, 27 Feb 2017 02:53:47 +0000]
Merge "Format Japanese numbers using national format when in Japan."
am: b2f4e09031

Change-Id: I85de42653261a9e8209d9101896298bdbfb4011b

2 years agoMerge "Format Japanese numbers using national format when in Japan."
Tyler Gunn [Mon, 27 Feb 2017 02:48:10 +0000]
Merge "Format Japanese numbers using national format when in Japan."

2 years agoMerge "Unreliable number(255) for voice message count should not be provided"
Yoshiaki Naka [Sun, 26 Feb 2017 21:36:13 +0000]
Merge "Unreliable number(255) for voice message count should not be provided"
am: 619d1c0381

Change-Id: I490a836b89be85bd1f745b2754a7b32ba3ca34c7

2 years agoMerge "Unreliable number(255) for voice message count should not be provided"
Treehugger Robot [Sun, 26 Feb 2017 21:29:27 +0000]
Merge "Unreliable number(255) for voice message count should not be provided"

2 years agoMerge "Send CMAS broadcast to additional package"
Jack Yu [Sat, 25 Feb 2017 04:58:05 +0000]
Merge "Send CMAS broadcast to additional package"
am: 574370b405

Change-Id: Icef787fa6b98abab4130dc4e4626161c08ffcc8c

2 years agoSend CMAS broadcast to additional package
Jack Yu [Thu, 23 Feb 2017 17:52:19 +0000]
Send CMAS broadcast to additional package

This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.

Test: manual
bug: 34393649
Merged-In: I88b0a568183b9701712e5071a6692e5d1ce08c7d
Change-Id: I88b0a568183b9701712e5071a6692e5d1ce08c7d

2 years agoMerge "Send CMAS broadcast to additional package"
Treehugger Robot [Sat, 25 Feb 2017 01:13:28 +0000]
Merge "Send CMAS broadcast to additional package"

2 years agoMerge "Mark oemhook related APIs @Deprecated."
Amit Mahajan [Fri, 24 Feb 2017 20:46:55 +0000]
Merge "Mark oemhook related APIs @Deprecated."
am: 029e267869

Change-Id: I6b382a8b9082da41bddc19849ecb06cdb46d2e48

2 years agoMerge "Mark oemhook related APIs @Deprecated."
Treehugger Robot [Fri, 24 Feb 2017 20:40:22 +0000]
Merge "Mark oemhook related APIs @Deprecated."

2 years agoMerge "Fix ImsPhoneCallTrackerTest"
Brad Ebinger [Fri, 24 Feb 2017 18:29:39 +0000]
Merge "Fix ImsPhoneCallTrackerTest"
am: 996540430d

Change-Id: I0e98d06024a95597fd560442acc300cc888e13ad

2 years agoMerge "Fix ImsPhoneCallTrackerTest"
Brad Ebinger [Fri, 24 Feb 2017 18:26:20 +0000]
Merge "Fix ImsPhoneCallTrackerTest"

2 years agoInitialize TestImsService with mock Context
Brad Ebinger [Fri, 24 Feb 2017 18:03:46 +0000]
Initialize TestImsService with mock Context

Initialize the TestImsService with a mock Context
to accomodate calls to a context when performing
permissions checking.

Change-Id: I7f517af0b69fa9a619e348f659bd3b1f943e3023

2 years agoresolve merge conflicts of a9a08b122 to stage-aosp-master
Amit Mahajan [Fri, 24 Feb 2017 05:42:24 +0000]
resolve merge conflicts of a9a08b122 to stage-aosp-master

Change-Id: I4bb424981bd67e0d848875b758cde346c3abaccb

2 years agoMerge "Merge the pollStateDone functions for GSM, CDMA and CDMA-LTE"
Treehugger Robot [Fri, 24 Feb 2017 04:38:08 +0000]
Merge "Merge the pollStateDone functions for GSM, CDMA and CDMA-LTE"

2 years agoSend CMAS broadcast to additional package
Jack Yu [Thu, 23 Feb 2017 17:52:19 +0000]
Send CMAS broadcast to additional package

This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.

Test: manual
bug: 34393649
Merged-In: I88b0a568183b9701712e5071a6692e5d1ce08c7d
Change-Id: I88b0a568183b9701712e5071a6692e5d1ce08c7d

2 years agoFix ImsPhoneCallTrackerTest
Brad Ebinger [Fri, 24 Feb 2017 01:39:11 +0000]
Fix ImsPhoneCallTrackerTest

With the addition of a ImsService status state, the
test needs to return ImsFeature.STATE_READY, or the
ImsPhoneCallTracker will not use that ImsService.

Test: Unit Tests pass
Change-Id: Ie134d7383d29aee34d9c4ac8e7ef4f2b77e87943

2 years agoMark oemhook related APIs @Deprecated.
Amit Mahajan [Thu, 23 Feb 2017 20:06:50 +0000]
Mark oemhook related APIs @Deprecated.

Test: none
Bug: 34344851
Change-Id: I0c16377d078cdf00af8efc784dd4e2e1f607995b

2 years agoMerge the pollStateDone functions for GSM, CDMA and CDMA-LTE
Amit Mahajan [Tue, 21 Feb 2017 23:04:48 +0000]
Merge the pollStateDone functions for GSM, CDMA and CDMA-LTE

Test: Basic telephony sanity
Bug: 28299251
Merged-in: I0a1a11623c1c27fe3449cf48f26982d7551cf6c2
Change-Id: I0a1a11623c1c27fe3449cf48f26982d7551cf6c2

2 years agoMerge commit '96140f71f60a923f66c6fd16e43a870b910e2919' into manual_merge_96140f71f
Sanket Padawe [Fri, 24 Feb 2017 00:34:19 +0000]
Merge commit '96140f71f60a923f66c6fd16e43a870b910e2919' into manual_merge_96140f71f

Test: build
Change-Id: Ic19481e3cf4d65273cd15a26e1da0177f0a83870

2 years agoMerge "Add more debugging logs for NITZ in dumpsys output."
Sanket Padawe [Fri, 24 Feb 2017 00:23:42 +0000]
Merge "Add more debugging logs for NITZ in dumpsys output."

2 years agoAdd more debugging logs for NITZ in dumpsys output.
Sanket Padawe [Tue, 11 Oct 2016 22:06:35 +0000]
Add more debugging logs for NITZ in dumpsys output.

Test: Basic log printing.
Bug: 31946097
Change-Id: I5103d7abe48a9e254fd92a2143ab705029f4e872
Merged-in: I5103d7abe48a9e254fd92a2143ab705029f4e872

2 years agoMerge "OemHook client implementation."
Amit Mahajan [Thu, 23 Feb 2017 19:38:12 +0000]
Merge "OemHook client implementation."
am: 4a9210e94a

Change-Id: I4cd489ad9915baf5a09624ab0ccbf33de001d835

2 years agoMerge "OemHook client implementation."
Treehugger Robot [Thu, 23 Feb 2017 19:33:34 +0000]
Merge "OemHook client implementation."

2 years agoOemHook client implementation.
Amit Mahajan [Tue, 14 Feb 2017 01:31:13 +0000]
OemHook client implementation.

Test: Basic telephony sanity
Bug: 32020264
Bug: 34344851
Merged-in: I7383da9245cc68d80eaebf27ebd26404d2d29f9f
Change-Id: I7383da9245cc68d80eaebf27ebd26404d2d29f9f

2 years agoMerge "Telephony: Use data and voice states for SPN"
Jack Yu [Thu, 23 Feb 2017 04:34:23 +0000]
Merge "Telephony: Use data and voice states for SPN"
am: c6d068613e

Change-Id: I857eb99f10a4b24372c058d1174719d6e8600559

2 years agoMerge "Telephony: Use data and voice states for SPN"
Jack Yu [Thu, 23 Feb 2017 04:31:39 +0000]
Merge "Telephony: Use data and voice states for SPN"

2 years agoTelephony: Use data and voice states for SPN
Shiva Kishore Tekale [Thu, 15 Sep 2016 11:59:35 +0000]
Telephony: Use data and voice states for SPN

SPN display text is based on both voice service state
and data service state.
Eg - Voice service state is OOS and data service state
is IN_SERVICE. In such cases, both regStates need to be
considered to determine what to show in UI for SPN.
Fix the wrong CDMA carrier text in expanded status bar.
After updating operator, the expanded status bar will
update SPN
For GSM, SPN is "no service" if service is out of service.
For CDMA, SPN is CDMA carrier. Check current service
state whether out of service, if yes, display "no service"
instead of SPN.

bug: 22640459
Test: manual
Change-Id: Ic46ac0c7e3af51a380bb2db5d71a71bf9595c2ec

2 years agoMerge "Adds logic to display UI if call forwarding is not enabled on 3gpp"
Brad Ebinger [Thu, 23 Feb 2017 00:56:34 +0000]
Merge "Adds logic to display UI if call forwarding is not enabled on 3gpp"
am: db053b8d87

Change-Id: Ibc203254c15b7c706b753029c404e16cbfbeb70e

2 years agoMerge "Adds logic to display UI if call forwarding is not enabled on 3gpp"
Brad Ebinger [Wed, 22 Feb 2017 23:22:06 +0000]
Merge "Adds logic to display UI if call forwarding is not enabled on 3gpp"

2 years agoMerge "Added telephony manager set sim power state API"
Jack Yu [Wed, 22 Feb 2017 02:49:18 +0000]
Merge "Added telephony manager set sim power state API"
am: 0f6e1a01fd

Change-Id: I589b24d3dc62581d375db74c245e0e62bf83b2b3

2 years agoMerge "Added telephony manager set sim power state API"
Treehugger Robot [Wed, 22 Feb 2017 02:45:17 +0000]
Merge "Added telephony manager set sim power state API"

2 years agoMerge "Permit IMS app to send single part SMS messages."
ashastry [Wed, 22 Feb 2017 00:55:09 +0000]
Merge "Permit IMS app to send single part SMS messages."
am: 0c93776eb5

Change-Id: I86970d664971fbe541996d61bed0ed6259594a4d

2 years agoMerge "Permit IMS app to send single part SMS messages."
ashastry [Wed, 22 Feb 2017 00:48:18 +0000]
Merge "Permit IMS app to send single part SMS messages."

2 years agoMerge "Remove Session ID from ImsService APIs that are not used"
Brad Ebinger [Tue, 21 Feb 2017 20:24:28 +0000]
Merge "Remove Session ID from ImsService APIs that are not used"
am: 3fe31f7fe8

Change-Id: I1ca31ed55c46a51ef8630995259f68db94cc860b

2 years agoMerge "Remove Session ID from ImsService APIs that are not used"
Treehugger Robot [Tue, 21 Feb 2017 20:19:19 +0000]
Merge "Remove Session ID from ImsService APIs that are not used"

2 years agoAdded telephony manager set sim power state API
Jack Yu [Thu, 16 Feb 2017 23:25:26 +0000]
Added telephony manager set sim power state API

The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755
Merged-In: I16488c12ef648bd884123b02b9f07394d8fbaa49
Change-Id: I16488c12ef648bd884123b02b9f07394d8fbaa49

2 years agoPermit IMS app to send single part SMS messages.
Abhijith Shastry [Tue, 14 Feb 2017 19:32:40 +0000]
Permit IMS app to send single part SMS messages.

BUG: 29899506
Test: Manual testing
Change-Id: I2b1c3062e72e746f15064be11591c4e203a94f00

2 years agoRemove Session ID from ImsService APIs that are not used
Brad Ebinger [Fri, 17 Feb 2017 22:52:52 +0000]
Remove Session ID from ImsService APIs that are not used

1) Remove session ID from ImsService APIs that do not need them.
2) Change logging in ImsResolver to be less verbose.

Test: Manual
Change-Id: Ifaa3daf6d78ef5dae873b3c5e48be60a5cf79836

2 years agoMerge "Add missed check for setAllowedCarriers api."
Sanket Padawe [Fri, 17 Feb 2017 22:28:42 +0000]
Merge "Add missed check for setAllowedCarriers api."
am: 43dd2bb743

Change-Id: I0372c9d7cca3c4d3699e6076b72b896a7336a450

2 years agoMerge "Add missed check for setAllowedCarriers api."
Treehugger Robot [Fri, 17 Feb 2017 21:39:36 +0000]
Merge "Add missed check for setAllowedCarriers api."

2 years agoresolve merge conflicts of 87ee8a1b2 to nyc-mr2-dev-plus-aosp
Brad Ebinger [Fri, 17 Feb 2017 20:17:53 +0000]
resolve merge conflicts of 87ee8a1b2 to nyc-mr2-dev-plus-aosp

Change-Id: Ic783c5e7d21a9945cde5e6692f8dec785e5572e1

2 years agoMerge "Modifications to support ImsResolver and adds Tests"
Brad Ebinger [Fri, 17 Feb 2017 19:33:07 +0000]
Merge "Modifications to support ImsResolver and adds Tests"
am: 80524b6320

Change-Id: I89c0a7f4b0d7bd7c1618c4946a705f6404cb5203

2 years agoMerge "Modifications to support ImsResolver and adds Tests"
Treehugger Robot [Fri, 17 Feb 2017 19:21:45 +0000]
Merge "Modifications to support ImsResolver and adds Tests"

2 years agoAdd missed check for setAllowedCarriers api.
Sanket Padawe [Fri, 17 Feb 2017 18:59:50 +0000]
Add missed check for setAllowedCarriers api.

Test: Checked passing null carriers list.
Bug: 35468257
Change-Id: I9861e9ee4360dc2f37995211dba88ea83e1ed86b

2 years agoMerge "Added the new RIL request to set SIM power state" am: 93c4fc94b3 am: 39419415ba
Jack Yu [Fri, 17 Feb 2017 01:40:57 +0000]
Merge "Added the new RIL request to set SIM power state" am: 93c4fc94b3 am: 39419415ba
am: 7434a63d74

Change-Id: I5e1cd785303bd40681fcf7886892351859a9a423

2 years agoMerge "Added the new RIL request to set SIM power state" am: 93c4fc94b3
Jack Yu [Fri, 17 Feb 2017 01:31:55 +0000]
Merge "Added the new RIL request to set SIM power state" am: 93c4fc94b3
am: 39419415ba

Change-Id: I229dd17c188f28419bfabd9a1994c4420478e9d3

2 years agoMerge "Added the new RIL request to set SIM power state"
Jack Yu [Fri, 17 Feb 2017 01:22:26 +0000]
Merge "Added the new RIL request to set SIM power state"
am: 93c4fc94b3

Change-Id: Iac9dd80f4795febecc9707d4c8751f9bff2e962a

2 years agoMerge "Added the new RIL request to set SIM power state"
Treehugger Robot [Fri, 17 Feb 2017 01:13:25 +0000]
Merge "Added the new RIL request to set SIM power state"

2 years agoMerge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev
Meng Wang [Thu, 16 Feb 2017 22:22:44 +0000]
Merge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev
am: d837aaa36e

Change-Id: I65a5659f78d73531cb752c0141750f756266e627

2 years agoMerge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev
Meng Wang [Thu, 16 Feb 2017 22:14:35 +0000]
Merge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev

2 years agoModifications to support ImsResolver and adds Tests
Brad Ebinger [Wed, 25 Jan 2017 22:29:39 +0000]
Modifications to support ImsResolver and adds Tests

1) Adds unit tests for ImsService and related classes.
2) Modifies the ImsPhoneCallTracker to support the new ImsResolver.
3) Modifies the ImsServiceController to relay ImsService status callbacks.

Test: Unit Tests added
Merged-In: Ibcb001ce13e0bcc21f02deede64f7ee8f1549e59
Change-Id: Ibcb001ce13e0bcc21f02deede64f7ee8f1549e59

2 years agoMerge "[CM] Deprecate maximum timeout value for request network" am: df54365c75 am...
Etan Cohen [Thu, 16 Feb 2017 14:38:36 +0000]
Merge "[CM] Deprecate maximum timeout value for request network" am: df54365c75 am: 416796eda2
am: cf2e62d6aa

Change-Id: I2d54c4534daafb62fd4b2bc0d9480d98e9611fd5

2 years agoMerge "[CM] Deprecate maximum timeout value for request network" am: df54365c75
Etan Cohen [Thu, 16 Feb 2017 14:29:37 +0000]
Merge "[CM] Deprecate maximum timeout value for request network" am: df54365c75
am: 416796eda2

Change-Id: I014daedcea881701c6922231b7e3381f4216be04

2 years agoMerge "[CM] Deprecate maximum timeout value for request network"
Etan Cohen [Thu, 16 Feb 2017 14:20:39 +0000]
Merge "[CM] Deprecate maximum timeout value for request network"
am: df54365c75

Change-Id: Ifd9d281aa1ba99b4a53c81e40423858f3780e3af

2 years agoMerge "[CM] Deprecate maximum timeout value for request network"
Etan Cohen [Thu, 16 Feb 2017 14:15:43 +0000]
Merge "[CM] Deprecate maximum timeout value for request network"

2 years agoDon't dial non-emergency CS voice call in airplane mode
Meng Wang [Tue, 14 Feb 2017 19:51:19 +0000]
Don't dial non-emergency CS voice call in airplane mode

Added a new CallStateException error code ERROR_POWER_OFF

Bug: 28709116
Change-Id: Ia63196d5e8c051a91da3e2a7e60ac605dccf8344

2 years agoAdded the new RIL request to set SIM power state
Jack Yu [Wed, 15 Feb 2017 23:31:14 +0000]
Added the new RIL request to set SIM power state

The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Merged-In: I71d07e39a07ee4c1ea877adf188955aeb5a70793
Change-Id: I71d07e39a07ee4c1ea877adf188955aeb5a70793

2 years agoMerge "Do not call getService() on wifi-only device." am: 48a17d6b56 am: 030b3bfa9f
Amit Mahajan [Wed, 15 Feb 2017 23:53:08 +0000]
Merge "Do not call getService() on wifi-only device." am: 48a17d6b56 am: 030b3bfa9f
am: 245cd7bf5a

Change-Id: Ic334546bf9e2a15a67e7f95333b7309e369937fe

2 years agoMerge "Do not call getService() on wifi-only device." am: 48a17d6b56
Amit Mahajan [Wed, 15 Feb 2017 23:49:35 +0000]
Merge "Do not call getService() on wifi-only device." am: 48a17d6b56
am: 030b3bfa9f

Change-Id: I9519ac3790c9dd009ae6a75fa55888f4b7918c47

2 years agoMerge "Do not call getService() on wifi-only device."
Amit Mahajan [Wed, 15 Feb 2017 23:41:28 +0000]
Merge "Do not call getService() on wifi-only device."
am: 48a17d6b56

Change-Id: I02c4cb9eb348ba05cfb61b1173541355666c8f19

2 years agoMerge "Do not call getService() on wifi-only device."
Treehugger Robot [Wed, 15 Feb 2017 23:22:36 +0000]
Merge "Do not call getService() on wifi-only device."

2 years agoDo not call getService() on wifi-only device.
Amit Mahajan [Wed, 15 Feb 2017 18:36:26 +0000]
Do not call getService() on wifi-only device.

Test: none
Bug: 35355251
Change-Id: If5b0cf2c04c21103849bf24b21ad71a79214e986

2 years agoMerge "Handle OPERATOR_DETERMINED_BARRING failure." into nyc-mr2-dev
Youhan Wang [Wed, 15 Feb 2017 01:18:13 +0000]
Merge "Handle OPERATOR_DETERMINED_BARRING failure." into nyc-mr2-dev
am: 122fcb16b3

Change-Id: Ifa1c38979bee675caf1aab9681d676da4309f411

2 years agoMerge "Handle OPERATOR_DETERMINED_BARRING failure." into nyc-mr2-dev
TreeHugger Robot [Wed, 15 Feb 2017 01:07:43 +0000]
Merge "Handle OPERATOR_DETERMINED_BARRING failure." into nyc-mr2-dev

2 years agoHandle OPERATOR_DETERMINED_BARRING failure.
Youhan Wang [Tue, 14 Feb 2017 22:03:19 +0000]
Handle OPERATOR_DETERMINED_BARRING failure.

1. Added CALL_FAIL_OPERATOR_DETERMINED_BARRING to CallFailCause.
2. Handle Mapping logic to regard CALL_FAIL_OPERATOR_DETERMINED_BARRING
as same as CALL_BARRED.

Bug:35184262
Change-Id: Iae68b94abfd3ec5800a50218623d092c743cc267

2 years agoMerge "Prevent phone process crashing on bad params to TelephonyTester am: e465c97904...
Android Build Merger (Role) [Tue, 14 Feb 2017 08:19:15 +0000]
Merge "Prevent phone process crashing on bad params to TelephonyTester am: e465c97904 am: f45c0ee61f" into nyc-mr2-dev-plus-aosp

2 years agoPrevent phone process crashing on bad params to TelephonyTester am: e465c97904
Erik Wolsheimer [Tue, 14 Feb 2017 08:19:05 +0000]
Prevent phone process crashing on bad params to TelephonyTester am: e465c97904
am: 3c000d9131

Change-Id: Idf83b9eccd7c4119156b63854b2829ab269f8ed3

2 years agoPrevent phone process crashing on bad params to TelephonyTester am: e465c97904
Erik Wolsheimer [Tue, 14 Feb 2017 08:19:05 +0000]
Prevent phone process crashing on bad params to TelephonyTester am: e465c97904
am: f45c0ee61f

Change-Id: I57e8dfc722d6f4cc0ade7a886f9cb73eb0e6506b

2 years agoPrevent phone process crashing on bad params to TelephonyTester
Erik Wolsheimer [Tue, 14 Feb 2017 08:17:05 +0000]
Prevent phone process crashing on bad params to TelephonyTester
am: e465c97904

Change-Id: I1ab377af76f41e187719081ff0829790d279e490

2 years agoPrevent phone process crashing on bad params to TelephonyTester
Erik Wolsheimer [Tue, 14 Feb 2017 08:17:04 +0000]
Prevent phone process crashing on bad params to TelephonyTester
am: e465c97904

Change-Id: Ib492ba77555a761ebcc2d1f7089b122136d954a2

2 years agoMerge "Fix to handle error in getRadioCapability() correctly." am: 8caf74e5c3 am...
Amit Mahajan [Tue, 14 Feb 2017 03:54:59 +0000]
Merge "Fix to handle error in getRadioCapability() correctly." am: 8caf74e5c3 am: a55cdd86fa
am: 79e658b7f9

Change-Id: Idc6b2fd475fbd0c0dc40c673ecf0b67bb2b5e8af

2 years agoMerge "Fix to handle error in getRadioCapability() correctly." am: 8caf74e5c3
Amit Mahajan [Tue, 14 Feb 2017 03:52:58 +0000]
Merge "Fix to handle error in getRadioCapability() correctly." am: 8caf74e5c3
am: a55cdd86fa

Change-Id: Ided861af39465398cda0897f4689fdc407ca3d47

2 years agoMerge "Fix to handle error in getRadioCapability() correctly."
Amit Mahajan [Tue, 14 Feb 2017 03:50:59 +0000]
Merge "Fix to handle error in getRadioCapability() correctly."
am: 8caf74e5c3

Change-Id: I4e991bc7707b7d2ff5b963f4557c4a703477d378

2 years agoMerge "Fix to handle error in getRadioCapability() correctly."
Treehugger Robot [Tue, 14 Feb 2017 03:47:15 +0000]
Merge "Fix to handle error in getRadioCapability() correctly."

2 years agoMerge "Make separate copy of protobuf libraries" am: 730858e96d am: 82a90a5602
Colin Cross [Tue, 14 Feb 2017 01:57:26 +0000]
Merge "Make separate copy of protobuf libraries" am: 730858e96d am: 82a90a5602
am: b0857d1264

Change-Id: Ie3b182944b379436c634f3a83a6349edde8c2711

2 years agoMerge "Make separate copy of protobuf libraries" am: 730858e96d
Colin Cross [Tue, 14 Feb 2017 01:55:28 +0000]
Merge "Make separate copy of protobuf libraries" am: 730858e96d
am: 82a90a5602

Change-Id: Iec2d27c7835975ed4dafc1b4dd4c46e5b66ff031

2 years agoMerge "Make separate copy of protobuf libraries"
Colin Cross [Tue, 14 Feb 2017 01:53:31 +0000]
Merge "Make separate copy of protobuf libraries"
am: 730858e96d

Change-Id: I0c182576476cc03751822959c4986e250cb0ff04

2 years agoMerge "add SimActivationTracker for voice/data act state" am: 246494c141 am: e44432224c
Chen Xu [Tue, 14 Feb 2017 01:46:39 +0000]
Merge "add SimActivationTracker for voice/data act state" am: 246494c141 am: e44432224c
am: 10405c3e20

Change-Id: I468b79bb6c63b53d871ec9ba1f5327312a08c20c

2 years agoMerge "Make separate copy of protobuf libraries"
Treehugger Robot [Tue, 14 Feb 2017 01:46:34 +0000]
Merge "Make separate copy of protobuf libraries"

2 years agoMerge "add SimActivationTracker for voice/data act state" am: 246494c141
Chen Xu [Tue, 14 Feb 2017 01:42:06 +0000]
Merge "add SimActivationTracker for voice/data act state" am: 246494c141
am: e44432224c

Change-Id: I0035daadeb4436309d1b9ba1ddee17cb78a5722a

2 years agoMerge "add SimActivationTracker for voice/data act state"
Chen Xu [Tue, 14 Feb 2017 01:34:06 +0000]
Merge "add SimActivationTracker for voice/data act state"
am: 246494c141

Change-Id: I3460553e6567b1a4d56e793764772576f441698e

2 years agoMerge "add SimActivationTracker for voice/data act state"
Chen Xu [Tue, 14 Feb 2017 01:26:18 +0000]
Merge "add SimActivationTracker for voice/data act state"

2 years agoMake separate copy of protobuf libraries
Colin Cross [Sat, 14 Jan 2017 00:56:46 +0000]
Make separate copy of protobuf libraries

Avoids proguard error on collision between telephony and framework
copies.

Test: m -j checkbuild
Change-Id: I1208ba475e82204f19c53787cfd80b3ed881b183

2 years agoFix to handle error in getRadioCapability() correctly.
Amit Mahajan [Mon, 13 Feb 2017 22:20:21 +0000]
Fix to handle error in getRadioCapability() correctly.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I241f9264b114dbdd0d99ba192213beb46dbde244

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929f...
Amit Mahajan [Mon, 13 Feb 2017 19:09:51 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929fd2527 am: ac8e9ddade
am: ff31314219

Change-Id: Ia39fd7a27d579bdfcdaa79284aaecdb82455176d

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929f...
Amit Mahajan [Mon, 13 Feb 2017 19:06:50 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929fd2527
am: ac8e9ddade

Change-Id: Icf692878d50fbc9d109e003d8be8e0b10d0301d6

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses - 2"
Amit Mahajan [Mon, 13 Feb 2017 19:04:21 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses - 2"
am: a929fd2527

Change-Id: Idfd768be60f112986380dbda1658a6e9053416b9

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa2736...
Amit Mahajan [Mon, 13 Feb 2017 19:02:01 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa27360b am: 18da34f372
am: 76bbecef7a

Change-Id: Idca01fcbd85c687fc44cd8b323cbc11de1f74c70

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses - 2"
Amit Mahajan [Mon, 13 Feb 2017 19:00:19 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses - 2"

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa27360b
Amit Mahajan [Mon, 13 Feb 2017 18:59:21 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa27360b
am: 18da34f372

Change-Id: Ifb33baba58b1bdd378495417e7ebf6186320179b

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses."
Amit Mahajan [Mon, 13 Feb 2017 18:57:19 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses."
am: b3fa27360b

Change-Id: If8eff10235a731bb21520fd1a89368530d161ffc

2 years agoMerge "Client (framework) side HAL changes for RIL solicited responses."
Amit Mahajan [Mon, 13 Feb 2017 18:54:21 +0000]
Merge "Client (framework) side HAL changes for RIL solicited responses."

2 years agoFormat Japanese numbers using national format when in Japan.
Tyler Gunn [Mon, 13 Feb 2017 05:23:43 +0000]
Format Japanese numbers using national format when in Japan.

Similar to the like change for Korean phone numbers, ensure that when the
user is in Japan, Japanese phone numbers are formatted using the national
format rather than the international format.

These tests confirm the new functionality.

Test: Unit
Bug: 27090466
Change-Id: Ic03b5387f512564a174aba8e516020c7d53dd99e

2 years agoClient (framework) side HAL changes for RIL solicited responses - 2
Amit Mahajan [Wed, 1 Feb 2017 00:57:37 +0000]
Client (framework) side HAL changes for RIL solicited responses - 2

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Ib2e70b94b401b8ab3e8968134e4dd20ec29ab989

2 years agoClient (framework) side HAL changes for RIL solicited responses.
Amit Mahajan [Fri, 10 Feb 2017 01:35:59 +0000]
Client (framework) side HAL changes for RIL solicited responses.

Bug: 32020264
Merged-in: Ib72f2443fb0580092e0f8560a40d3fb9b182887e
Change-Id: Ib72f2443fb0580092e0f8560a40d3fb9b182887e