2 years agoCall set initial attach apn when roaming status changes
Jack Yu [Fri, 31 Mar 2017 18:50:45 +0000]
Call set initial attach apn when roaming status changes

This is needed for the old modem (RIL version <15) which only
accepts one protocol based on the roaming condition. In that
case we need to call set initial attach apn again so the
correct protocol can be passed down to the modem.

Test: Telephony sanity tests and unit tests
bug: 35210742
Change-Id: I5e88a61a1cc69d22ed319e598050509341833d7d

2 years agoMerge "Remove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys" into oc-dev
Shuo Qian [Fri, 31 Mar 2017 18:44:05 +0000]
Merge "Remove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys" into oc-dev

2 years agoMerge "Fix GsmInboundSmsHandler unit tests." into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 17:03:35 +0000]
Merge "Fix GsmInboundSmsHandler unit tests." into oc-dev

2 years agoRemove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys
shuoq [Thu, 30 Mar 2017 23:34:59 +0000]
Remove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys

Bug: 36686977
Test: Manual
Change-Id: I920aeb28df7456f4c5b07495bb8c63638634ef37

2 years agoMerge "Correct NPE when active call is disconnected." into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 23:31:37 +0000]
Merge "Correct NPE when active call is disconnected." into oc-dev

2 years agoFix GsmInboundSmsHandler unit tests.
Amit Mahajan [Thu, 30 Mar 2017 23:27:32 +0000]
Fix GsmInboundSmsHandler unit tests.

Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Bug: 29579544
Change-Id: I3a2b97c2ce27637f673706eb329a4f8979c04cd4

2 years agoCorrect NPE when active call is disconnected.
Tyler Gunn [Thu, 30 Mar 2017 18:36:25 +0000]
Correct NPE when active call is disconnected.

Its possible for an active call to be disconnected, in which case it has
no ImsCall.  This causes a NPE in the "shouldDisconnect..." logic.

Test: Manual
Bug: 36777742
Merged-In: I4b4a3564143c60df811ba9f6040ca073e49f7487
Change-Id: I00cba85d426aedbbb46251528953b314f4f5dc35

2 years agoMerge "Disable voice call barring notification for VZN." into oc-dev
Sanket Padawe [Thu, 30 Mar 2017 20:52:17 +0000]
Merge "Disable voice call barring notification for VZN." into oc-dev

2 years agoDisable voice call barring notification for VZN.
Sanket Padawe [Tue, 28 Mar 2017 22:25:28 +0000]
Disable voice call barring notification for VZN.

Test: Manual
Bug: 31490566
Change-Id: I729a7da49d5379d0559653a1d702881979bc6711

2 years agoMerge "Allow port and originating number to be specified for VVM SMS" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 01:39:19 +0000]
Merge "Allow port and originating number to be specified for VVM SMS" into oc-dev

2 years agoMerge "Allow UTF-8 data SMS to be filtered as VVM SMS" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 01:39:19 +0000]
Merge "Allow UTF-8 data SMS to be filtered as VVM SMS" into oc-dev

2 years agoAllow port and originating number to be specified for VVM SMS
Ta-wei Yen [Thu, 9 Mar 2017 01:11:31 +0000]
Allow port and originating number to be specified for VVM SMS

This CL allows the VisualVoicemailService to ignore SMS not from the
designated number or to the designated port.

The VVM SMS filer can be configured to allow only SMS from certain
number or to certain port to be considered as a VVM SMS.
For numbers if the list is not empty, the originating number must be
an exact match to one of the numbers in the list.
For port it can be exact port, any data SMS port, or anything
(default).

Change-Id: I3d4aa34a342ba93d23841c07cbda2c2806f89dc4
Fixes: 36075510
Test: VisualVoicemailSmsFilterTest
      CTS VisualVoicemailServiceTest

2 years agoFix broken unit tests.
Abhijith Shastry [Tue, 28 Mar 2017 23:02:47 +0000]
Fix broken unit tests.

BUG: 36645899
Test: Unit test fixes
Change-Id: I47f984363e8e469651de91f7501dc8486b6beb27

2 years agoAllow UTF-8 data SMS to be filtered as VVM SMS
Ta-wei Yen [Fri, 10 Mar 2017 02:30:56 +0000]
Allow UTF-8 data SMS to be filtered as VVM SMS

The OMTP visual voicemail specification does not specify what the
VVM SMS is.

Previouly only data SMS that is encoded with the Data Coding Scheme
GSM 7bit or UCS2 can be recognized. These format cannot be sent with
SmsManager.sendDataMessage() and prevents CTS testing.

This CL will attempt to decode the 8bit binary DCS userdata as a UTF-8
string. This format can be sent with sendDataMessage()

Fixes: 33397325
Fixes: 36075510
Test: CTS VisualVoicemailServiceTest

Change-Id: I81aa2993d43d1a39e1192d02828a4d982475441f

2 years agoString changes for Voice/Data/Emergency services blocked.
Sanket Padawe [Mon, 27 Mar 2017 21:05:39 +0000]
String changes for Voice/Data/Emergency services blocked.

Bug: 31490566
Change-Id: Ic73e235fb4c412b5041ee03bc96de3b168ef741e
(cherry picked from commit 75ddc0cd156fd3c551dc8750df7ff6f09caaf30f)
Merged-in: Ic73e235fb4c412b5041ee03bc96de3b168ef741e

2 years agoMerge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer" am: b40f09bceb...
Brad Ebinger [Mon, 27 Mar 2017 23:26:49 +0000]
Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer" am: b40f09bceb am: 84835fe2d6
am: 431f50d7e0

Change-Id: Id8db8b06e41d7d2de0329ebd3ea473e56fce8b01

2 years agoMerge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer" am: b40f09bceb
Brad Ebinger [Mon, 27 Mar 2017 23:23:49 +0000]
Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer" am: b40f09bceb
am: 84835fe2d6

Change-Id: Ic81cfcf837a83f63c5df70cd7e5b5ff3093f9a3c

2 years agoMerge "Fixed failed unit test cases"
Jack Yu [Mon, 27 Mar 2017 23:22:52 +0000]
Merge "Fixed failed unit test cases"

2 years agoMerge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer"
Brad Ebinger [Mon, 27 Mar 2017 23:20:18 +0000]
Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer"
am: b40f09bceb

Change-Id: I72faeab21453a11a3c2a6ef8096aebd3b9814e44

2 years agoMerge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer"
Brad Ebinger [Mon, 27 Mar 2017 23:16:50 +0000]
Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer"

2 years agoMerge "Fixed failed unit tests" am: 669f790a27 am: 079d18be2f
Jack Yu [Mon, 27 Mar 2017 22:57:17 +0000]
Merge "Fixed failed unit tests" am: 669f790a27 am: 079d18be2f
am: 24baac511e  -s ours

Change-Id: Ice72e432904f71cd938e53b0bf6b03646514d342

2 years agoMerge "Fixed failed unit tests" am: 669f790a27
Jack Yu [Mon, 27 Mar 2017 22:54:16 +0000]
Merge "Fixed failed unit tests" am: 669f790a27
am: 079d18be2f

Change-Id: I74c7c9206429814c81b971a0136bb1470381c545

2 years agoMerge "Fixed failed unit tests"
Jack Yu [Mon, 27 Mar 2017 22:51:17 +0000]
Merge "Fixed failed unit tests"
am: 669f790a27

Change-Id: Ifbd785416e1fe650d629e32a411631404a358444

2 years agoMerge "Fixed failed unit tests"
Treehugger Robot [Mon, 27 Mar 2017 22:47:38 +0000]
Merge "Fixed failed unit tests"

2 years agoFixed failed unit test cases
Jack Yu [Mon, 27 Mar 2017 18:56:03 +0000]
Fixed failed unit test cases

The unit test case testSimError starts to fail due to the
recent CL https://android-review.googlesource.com/#/c/330668/
Fixed by adding slot id validation.

Test: runtest -x SubscriptionInfoUpdaterTest.java
bug: 29579544
Change-Id: Ie3aeeae37fc923c2d6a5e381591626245bec6132

2 years agoMerge "Fixed failed unit tests"
TreeHugger Robot [Sun, 26 Mar 2017 22:03:25 +0000]
Merge "Fixed failed unit tests"

2 years agoFixed failed unit tests
Jack Yu [Sat, 25 Mar 2017 07:40:02 +0000]
Fixed failed unit tests

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
bug: 29579544

Merged-In: Ib53a4e7fee5dee1f305303bfbd914e31cdd2ab71
Change-Id: Ib53a4e7fee5dee1f305303bfbd914e31cdd2ab71

2 years agoFixed failed unit tests
Jack Yu [Sat, 25 Mar 2017 07:40:02 +0000]
Fixed failed unit tests

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
bug: 29579544
Change-Id: Ib53a4e7fee5dee1f305303bfbd914e31cdd2ab71

2 years agoMerge "Increment radio proxy cookie when service is dead." am: fe88f5e66c am: c46c6c5379
Amit Mahajan [Sat, 25 Mar 2017 04:50:01 +0000]
Merge "Increment radio proxy cookie when service is dead." am: fe88f5e66c am: c46c6c5379
am: fc7362b75e

Change-Id: I0fc0c65d48bb7ecb4a7f9156ae6fccc7db7db2e1

2 years agoMerge "Increment radio proxy cookie when service is dead." am: fe88f5e66c
Amit Mahajan [Sat, 25 Mar 2017 04:47:30 +0000]
Merge "Increment radio proxy cookie when service is dead." am: fe88f5e66c
am: c46c6c5379

Change-Id: Id9046dcf6007021ac22f331cb51735d71c123162

2 years agoMerge "Increment radio proxy cookie when service is dead."
Amit Mahajan [Sat, 25 Mar 2017 04:45:01 +0000]
Merge "Increment radio proxy cookie when service is dead."
am: fe88f5e66c

Change-Id: I2b5657570590afe9e7e09bf214c92b3981606338

2 years agoMerge "Increment radio proxy cookie when service is dead."
Treehugger Robot [Sat, 25 Mar 2017 04:42:38 +0000]
Merge "Increment radio proxy cookie when service is dead."

2 years agoMerge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR...
Sandeep Gutta [Sat, 25 Mar 2017 01:16:48 +0000]
Merge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR" am: bc5ef4faf0 am: 3cdff517a6
am: 75c74e36a8

Change-Id: Ia96426248353a759d9d69bc3dca044392b5b4d6b

2 years agoMerge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR...
Sandeep Gutta [Sat, 25 Mar 2017 01:14:17 +0000]
Merge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR" am: bc5ef4faf0
am: 3cdff517a6

Change-Id: I6ce9bca58a710632e494a233ca32b64aea705fcc

2 years agoMerge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR"
Sandeep Gutta [Sat, 25 Mar 2017 01:12:17 +0000]
Merge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR"
am: bc5ef4faf0

Change-Id: I107843b4a461f7702877e733abd7c05f78d51496

2 years agoMerge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR"
Treehugger Robot [Sat, 25 Mar 2017 01:07:33 +0000]
Merge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR"

2 years agoIncrement radio proxy cookie when service is dead.
Amit Mahajan [Fri, 24 Mar 2017 22:22:29 +0000]
Increment radio proxy cookie when service is dead.

This is to avoid trying to get service constantly and have
delays between attempts as intended.

Test: Basic telephony sanity
Bug: 36599399
Change-Id: I6926c67ba9ae84f9841ef7b0b88d5e340201dc20

2 years agoresolve merge conflicts of 3ed74f4b6 to stage-aosp-master am: 26d16a3dd3
Amit Mahajan [Fri, 24 Mar 2017 23:44:42 +0000]
resolve merge conflicts of 3ed74f4b6 to stage-aosp-master am: 26d16a3dd3
am: 6c45ba8a1b  -s ours

Change-Id: Iba6c2b0627bd6a693941cfe7188f246f7b9dd70a

2 years agoresolve merge conflicts of 3ed74f4b6 to stage-aosp-master
Amit Mahajan [Fri, 24 Mar 2017 23:42:12 +0000]
resolve merge conflicts of 3ed74f4b6 to stage-aosp-master
am: 26d16a3dd3

Change-Id: Ifd1c524cea9e0dcf80da9bdf6f394d232b8e669a

2 years agoresolve merge conflicts of 3ed74f4b6 to stage-aosp-master
Amit Mahajan [Fri, 24 Mar 2017 22:55:21 +0000]
resolve merge conflicts of 3ed74f4b6 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id6c90fa0f3b8821ac3e786ebc22e7aa5ac22cfad

2 years agoMerge "Unit test fixes. Most failures were due to new mockito."
Amit Mahajan [Fri, 24 Mar 2017 20:43:18 +0000]
Merge "Unit test fixes. Most failures were due to new mockito."

2 years agoMerge "Deprecated getDeviceId and added getMeid and getImei" am: 1cb7194eb1 am: a02cf...
Jack Yu [Fri, 24 Mar 2017 17:22:55 +0000]
Merge "Deprecated getDeviceId and added getMeid and getImei" am: 1cb7194eb1 am: a02cff1d80
am: 04fbcc902c  -s ours

Change-Id: Ib9bea564cfff55cea10f80fcbc9bac0aef0818d5

2 years agoMerge "Deprecated getDeviceId and added getMeid and getImei" am: 1cb7194eb1
Jack Yu [Fri, 24 Mar 2017 17:16:51 +0000]
Merge "Deprecated getDeviceId and added getMeid and getImei" am: 1cb7194eb1
am: a02cff1d80

Change-Id: I5df6eba37779731cdf924e19c43385fadbf234d3

2 years agoMerge "Deprecated getDeviceId and added getMeid and getImei"
Jack Yu [Fri, 24 Mar 2017 17:11:03 +0000]
Merge "Deprecated getDeviceId and added getMeid and getImei"
am: 1cb7194eb1

Change-Id: I60ee1e9ab067f237ad86cb8ca054c273f3396c1a

2 years agoMerge "Deprecated getDeviceId and added getMeid and getImei"
Jack Yu [Fri, 24 Mar 2017 17:02:58 +0000]
Merge "Deprecated getDeviceId and added getMeid and getImei"

2 years agoMerge "Deprecated getDeviceId and added getMeid and getImei"
Jack Yu [Fri, 24 Mar 2017 02:09:42 +0000]
Merge "Deprecated getDeviceId and added getMeid and getImei"

2 years agoMerge "Fix minor issues in UiccCarrierPrivilegeRules."
Jeff Davidson [Fri, 24 Mar 2017 00:19:55 +0000]
Merge "Fix minor issues in UiccCarrierPrivilegeRules."

2 years agoMerge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready...
Jayachandran Chinnakkannu [Thu, 23 Mar 2017 23:30:11 +0000]
Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready" am: 35f4675016 am: fcb14f5fcb
am: ac7ca0f9ef

Change-Id: If029c5c7966a5f062d0d4e9554abcd9f73e463e8

2 years agoMerge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready...
Jayachandran Chinnakkannu [Thu, 23 Mar 2017 23:28:11 +0000]
Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready" am: 35f4675016
am: fcb14f5fcb

Change-Id: I6a8389d49d033f754d3a9a6b37219c5a5a304da8

2 years agoMerge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
Jayachandran Chinnakkannu [Thu, 23 Mar 2017 23:25:48 +0000]
Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
am: 35f4675016

Change-Id: Ia9574b39e40c23163936f9021d3464a504292a04

2 years agoMerge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
Jayachandran Chinnakkannu [Thu, 23 Mar 2017 23:21:50 +0000]
Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"

2 years agoFix minor issues in UiccCarrierPrivilegeRules.
Jeff Davidson [Thu, 23 Mar 2017 22:35:51 +0000]
Fix minor issues in UiccCarrierPrivilegeRules.

Cleans up incorrect indentation/line lengths and resolves compiler
warnings around unnecessary boxing and identical catch blocks.

Test: Will verify with TreeHugger
Change-Id: I00b7abe6b9cf3bfcb9bd0936a1bba0b273ec9a40

2 years agoMerge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"" am: 0a72d2beed...
Brad Ebinger [Thu, 23 Mar 2017 21:47:04 +0000]
Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"" am: 0a72d2beed am: ab44afee43
am: 9dea9c86d0

Change-Id: I5f9f13c959b2f868e8feb5e55871edaae54fa984

2 years agoMerge "Notification for MM reject cause code" am: e3d52a2907 -s ours am: 0cad146847...
Brad Ebinger [Thu, 23 Mar 2017 21:44:27 +0000]
Merge "Notification for MM reject cause code" am: e3d52a2907  -s ours am: 0cad146847  -s ours
am: 42e2a286d0  -s ours

Change-Id: Ic260c3a1d77766e84ad27135a98ce9ff1ecd6b8f

2 years agoDeprecated getDeviceId and added getMeid and getImei
Jack Yu [Thu, 16 Mar 2017 00:10:18 +0000]
Deprecated getDeviceId and added getMeid and getImei

Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Merged-In: If3b87f071e1e38d19008bdea3d7401802d72f5ad
Change-Id: If3b87f071e1e38d19008bdea3d7401802d72f5ad

2 years agoDeprecated getDeviceId and added getMeid and getImei
Jack Yu [Thu, 16 Mar 2017 00:10:18 +0000]
Deprecated getDeviceId and added getMeid and getImei

Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Change-Id: If3b87f071e1e38d19008bdea3d7401802d72f5ad

2 years agoClear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready
Jayachandran C [Wed, 22 Mar 2017 00:23:20 +0000]
Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready

mAutoAttachOnCreation allows data call for nwTypeChanged after
airplane mode toggle or radio reset but before modem actaully
registers on service. This causes data leak on roaming networks
for shorter time even though data roaming is disabled.

Bug: 31266202
Change-Id: Ia83146a0dafd9e2967d3e99829eea0ec08218b8a

2 years agoMerge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"" am: 0a72d2beed
Brad Ebinger [Thu, 23 Mar 2017 21:31:39 +0000]
Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"" am: 0a72d2beed
am: ab44afee43

Change-Id: I4fdec36ec6ff761afff98b8396cb649c79d9b177

2 years agoMerge "Notification for MM reject cause code" am: e3d52a2907 -s ours
Brad Ebinger [Thu, 23 Mar 2017 21:28:16 +0000]
Merge "Notification for MM reject cause code" am: e3d52a2907  -s ours
am: 0cad146847  -s ours

Change-Id: I732bfe6f7c7328020e5e3fb35ea6c70d79194a9e

2 years agoMerge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
Brad Ebinger [Thu, 23 Mar 2017 21:18:53 +0000]
Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
am: 0a72d2beed

Change-Id: I954b95b8eb08e9696300020ab551940a87c384b1

2 years agoMerge "Notification for MM reject cause code"
Brad Ebinger [Thu, 23 Mar 2017 21:16:21 +0000]
Merge "Notification for MM reject cause code"
am: e3d52a2907  -s ours

Change-Id: I03dbc5d87e907f9846b546894f4f733bdd03ee45

2 years agoNull check IMS calls in shouldDisconnectActiveCallOnAnswer
Brad Ebinger [Thu, 23 Mar 2017 21:10:51 +0000]
Null check IMS calls in shouldDisconnectActiveCallOnAnswer

Adds a check to shouldDisconnectActiveCallOnAnswer to
ensure that the active IMS call and incoming IMS call
are non-null. This can happen in cases when the
ImsPhoneCallTracker moves into a bad state.

Bug: 36273870
Test: Telephony Unit Tests
Change-Id: Ia31bb8cc6e425b63f836e8244bb3919d10c50731

2 years agoMerge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
Brad Ebinger [Thu, 23 Mar 2017 21:05:52 +0000]
Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""

2 years agoMerge "Notification for MM reject cause code"
Brad Ebinger [Thu, 23 Mar 2017 21:04:40 +0000]
Merge "Notification for MM reject cause code"

2 years agoNotification for MM reject cause code
manabu.x.fujiwara [Wed, 8 Mar 2017 06:10:54 +0000]
Notification for MM reject cause code

Display notification when UE fails to register network with specific
reject cause code. The notification includes specific strings and icon.
Since some carriers require, this feature is needed.

Test: manual with simulated RIL
Bug: 28923693
Merged-In: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8

2 years agoNotification for MM reject cause code am: 689189c6dd
manabu.x.fujiwara [Thu, 23 Mar 2017 19:42:00 +0000]
Notification for MM reject cause code am: 689189c6dd
am: ae57ff7c2b

Change-Id: I60b14f555603495f84e3cd33b28460788eebd810

2 years agoNotification for MM reject cause code
manabu.x.fujiwara [Thu, 23 Mar 2017 19:36:26 +0000]
Notification for MM reject cause code
am: 689189c6dd

Change-Id: I20a0f2c28756b155a7b74fdc7b681f6ae3692c02

2 years agoRevert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"
Brad Ebinger [Thu, 23 Mar 2017 00:11:31 +0000]
Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"

This reverts commit 9f13848d600c0782a5bcb3b1d2d7dca5dca35005.

Looks to be causing issues where ImsPhoneCallTracker
state is out of sync with ImsService

Bug: 36273870
Change-Id: Id3cfbdc007c561f886adffd16def76dac553ac27

2 years agoNotification for MM reject cause code
manabu.x.fujiwara [Wed, 8 Mar 2017 06:10:54 +0000]
Notification for MM reject cause code

Display notification when UE fails to register network with specific
reject cause code. The notification includes specific strings and icon.
Since some carriers require, this feature is needed.

Test: manual with simulated RIL
Bug: 28923693
Merged-In: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8

2 years agoMerge "sendDialerCode API review"
Chen Xu [Thu, 23 Mar 2017 01:17:28 +0000]
Merge "sendDialerCode API review"

2 years agoMerge "Change 'idx' to 'index' for SubscriptionManager api." am: 5b18fad29a am: a9c03...
Sanket Padawe [Thu, 23 Mar 2017 01:07:01 +0000]
Merge "Change 'idx' to 'index' for SubscriptionManager api." am: 5b18fad29a am: a9c03ba25d
am: 89070b0024  -s ours

Change-Id: I75b38764460d80eacc12ff8103684c2955576985

2 years agoMerge "Change 'idx' to 'index' for SubscriptionManager api." am: 5b18fad29a
Sanket Padawe [Thu, 23 Mar 2017 00:58:03 +0000]
Merge "Change 'idx' to 'index' for SubscriptionManager api." am: 5b18fad29a
am: a9c03ba25d

Change-Id: Ifb4c4ff2928e1f5da291d7e8cf5e269caae09416

2 years agoMerge "Change 'idx' to 'index' for SubscriptionManager api."
Sanket Padawe [Thu, 23 Mar 2017 00:45:46 +0000]
Merge "Change 'idx' to 'index' for SubscriptionManager api."
am: 5b18fad29a

Change-Id: Icad67550539e3f8210ce669489c3a4c476e2c06e

2 years agoMerge "Change 'idx' to 'index' for SubscriptionManager api."
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000]
Merge "Change 'idx' to 'index' for SubscriptionManager api."

2 years agoMerge "Invalid call forwarding indicator status check" am: fa3049fdfa am: 918d0cdfa2
Jack Yu [Wed, 22 Mar 2017 21:02:41 +0000]
Merge "Invalid call forwarding indicator status check" am: fa3049fdfa am: 918d0cdfa2
am: 9b4145269f

Change-Id: I699fb202b85c9ac59ce4533d478f1dea45cbd154

2 years agoMerge "reset carrier actions on sim loaded" am: 2328077d0b am: 461848ed06
Chen Xu [Wed, 22 Mar 2017 21:02:30 +0000]
Merge "reset carrier actions on sim loaded" am: 2328077d0b am: 461848ed06
am: fb7ed3da2d

Change-Id: I3c6b90ba6250983655dd281e8e9a4632ce4afa1c

2 years agoMerge "Invalid call forwarding indicator status check" am: fa3049fdfa
Jack Yu [Wed, 22 Mar 2017 21:00:42 +0000]
Merge "Invalid call forwarding indicator status check" am: fa3049fdfa
am: 918d0cdfa2

Change-Id: I4b42b1a5a32b2bdad1ee15ac7d67ba9d823a2e77

2 years agoMerge "reset carrier actions on sim loaded" am: 2328077d0b
Chen Xu [Wed, 22 Mar 2017 20:59:59 +0000]
Merge "reset carrier actions on sim loaded" am: 2328077d0b
am: 461848ed06

Change-Id: I7823ead36af3380a4d24927048f816459ca36786

2 years agoMerge "Invalid call forwarding indicator status check"
Jack Yu [Wed, 22 Mar 2017 20:59:03 +0000]
Merge "Invalid call forwarding indicator status check"
am: fa3049fdfa

Change-Id: Ibd45fa7b81db530deac2782833f2172f87df5b4b

2 years agoMerge "reset carrier actions on sim loaded"
Chen Xu [Wed, 22 Mar 2017 20:58:51 +0000]
Merge "reset carrier actions on sim loaded"
am: 2328077d0b

Change-Id: If962acdc29aa07e7164bca9ce71c6149ca33412e

2 years agoMerge "Invalid call forwarding indicator status check"
Jack Yu [Wed, 22 Mar 2017 20:52:36 +0000]
Merge "Invalid call forwarding indicator status check"

2 years agoMerge "reset carrier actions on sim loaded"
Chen Xu [Wed, 22 Mar 2017 20:50:17 +0000]
Merge "reset carrier actions on sim loaded"

2 years agoMerge "Add missing handling for RIL_UNSOL_ON_SS." am: d110bd5bfa am: b50de137d3
Amit Mahajan [Wed, 22 Mar 2017 19:15:52 +0000]
Merge "Add missing handling for RIL_UNSOL_ON_SS." am: d110bd5bfa am: b50de137d3
am: 281e24a34a

Change-Id: Ib8f7f07c9ca79b6d87e1a3281585a9cfc1c7e19c

2 years agoMerge "Add missing handling for RIL_UNSOL_ON_SS." am: d110bd5bfa
Amit Mahajan [Wed, 22 Mar 2017 19:13:52 +0000]
Merge "Add missing handling for RIL_UNSOL_ON_SS." am: d110bd5bfa
am: b50de137d3

Change-Id: Ia59fedf03808772eb0ef6a900f4cdc32564e50df

2 years agoMerge "Add missing handling for RIL_UNSOL_ON_SS."
Amit Mahajan [Wed, 22 Mar 2017 19:12:18 +0000]
Merge "Add missing handling for RIL_UNSOL_ON_SS."
am: d110bd5bfa

Change-Id: Id4dfd44ca4a36454f8a1352742c31760f7d88716

2 years agoMerge "Add missing handling for RIL_UNSOL_ON_SS."
Amit Mahajan [Wed, 22 Mar 2017 19:03:48 +0000]
Merge "Add missing handling for RIL_UNSOL_ON_SS."

2 years agoMerge "Remove rild sockets." am: 4f6584f665 am: 2c47a73b1e
Amit Mahajan [Wed, 22 Mar 2017 17:03:09 +0000]
Merge "Remove rild sockets." am: 4f6584f665 am: 2c47a73b1e
am: 87f987bc73  -s ours

Change-Id: Ic0a7e132b7d3ccd34eac6d18d72c0a5fd72e7987

2 years agoAdd missing handling for RIL_UNSOL_ON_SS.
Amit Mahajan [Wed, 22 Mar 2017 16:58:41 +0000]
Add missing handling for RIL_UNSOL_ON_SS.

Test: none
Bug: 32020264
Change-Id: I5d3429765ca90dda9dac656599ae9d0296ea5401

2 years agoMerge "Remove rild sockets." am: 4f6584f665
Amit Mahajan [Wed, 22 Mar 2017 17:00:15 +0000]
Merge "Remove rild sockets." am: 4f6584f665
am: 2c47a73b1e

Change-Id: I4f4ae3dfde097ae385f16ff74efb3a346ffd7383

2 years agoMerge "Remove rild sockets."
Amit Mahajan [Wed, 22 Mar 2017 16:58:36 +0000]
Merge "Remove rild sockets."
am: 4f6584f665

Change-Id: Ice9ddee78663683b25f7adffd75ea90f0275020f

2 years agoMerge "Unit test fixes. Most failures were due to new mockito."
Amit Mahajan [Wed, 22 Mar 2017 16:57:12 +0000]
Merge "Unit test fixes. Most failures were due to new mockito."

2 years agoMerge "Remove rild sockets."
Amit Mahajan [Wed, 22 Mar 2017 16:54:40 +0000]
Merge "Remove rild sockets."

2 years agoUnit test fixes. Most failures were due to new mockito.
Amit Mahajan [Tue, 21 Mar 2017 22:57:06 +0000]
Unit test fixes. Most failures were due to new mockito.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
Bug: 29579544
Change-Id: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98

2 years agoreset carrier actions on sim loaded
fionaxu [Tue, 21 Mar 2017 18:27:52 +0000]
reset carrier actions on sim loaded

There are some use cases where carriers activate SIM's data service by
updating EF files with an ICC refresh event. Slightly different from hot
sim swap, this might not go through the complete SIM loading procedure
and won't recreate any new Icc Record as well.
- Move carrier action reset to recordsLoaded event handler which handles
both ICC refresh and hot sim swap.
- refactor carrier action reset from individual modules to carrier
action agent

Bug: 36154348
Test: Manual
Change-Id: I7af8b1d956ba7dfa1efdc8858b49903f24382dbe

2 years agoUnit test fixes. Most failures were due to new mockito.
Amit Mahajan [Tue, 21 Mar 2017 22:57:06 +0000]
Unit test fixes. Most failures were due to new mockito.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
Bug: 29579544
Merged-in: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98
Change-Id: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98

2 years agoMerge "Remove rild sockets."
Amit Mahajan [Tue, 21 Mar 2017 23:03:47 +0000]
Merge "Remove rild sockets."

2 years agoRemove rild sockets.
Amit Mahajan [Tue, 14 Mar 2017 23:40:33 +0000]
Remove rild sockets.

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

2 years agoChange 'idx' to 'index' for SubscriptionManager api.
Sanket Padawe [Fri, 17 Mar 2017 22:34:39 +0000]
Change 'idx' to 'index' for SubscriptionManager api.

Bug: 35767068
Test: No build failure on update.
Change-Id: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b
Merged-in: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b

2 years agoMerge "Change 'idx' to 'index' for SubscriptionManager api."
Sanket Padawe [Tue, 21 Mar 2017 22:12:55 +0000]
Merge "Change 'idx' to 'index' for SubscriptionManager api."

2 years agoChange 'idx' to 'index' for SubscriptionManager api.
Sanket Padawe [Tue, 21 Mar 2017 17:57:55 +0000]
Change 'idx' to 'index' for SubscriptionManager api.

Bug: 35767068
Test: No build failure on update.
Change-Id: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b