Commit Graph

3936 Commits

Author SHA1 Message Date
Hall Liu
84bac8eae3 Merge "Add carrier config for auto redialing 911" am: b91316f203 am: 9e76e3acb9 am: 36af741ace
am: c99da79bde

Change-Id: Ibafa3ab93c00e53bd648a0da5973dee6f27287e4
2018-07-26 19:27:31 -07:00
Hall Liu
36af741ace Merge "Add carrier config for auto redialing 911" am: b91316f203
am: 9e76e3acb9

Change-Id: I9713fcc0f73f98bf41cd95517f5031f325a92c03
2018-07-26 18:05:23 -07:00
Hall Liu
9e76e3acb9 Merge "Add carrier config for auto redialing 911"
am: b91316f203

Change-Id: Ie77021a09bb896faaa5fc5686563b0ddbf645d48
2018-07-26 17:52:16 -07:00
Hall Liu
b91316f203 Merge "Add carrier config for auto redialing 911" 2018-07-26 20:22:03 +00:00
Hall Liu
f31f38562f Add carrier config for auto redialing 911
Bug: 111235453
Test: manual (modify IMS stack locally to always return the 380 error
when dialing in airplane mode)

Change-Id: I029d2227ce62bb11fa91e9d5338a667d6e3dd59b
2018-07-25 18:48:55 -07:00
Nathan Harold
e0be144536 Merge "Merge "Access Identity and SignalStrength from CellInfo" am: c99ced9db8 am: 232487ff44 am: dabe94f353" into pi-dev-plus-aosp
am: 983d3ed295

Change-Id: Ifb97a479572d12717dabd2c1003342246dc80f00
2018-07-23 18:51:29 -07:00
Nathan Harold
dabe94f353 Merge "Access Identity and SignalStrength from CellInfo" am: c99ced9db8
am: 232487ff44

Change-Id: I5602c4c6ef7287c7549ca35533c7f3dbc6856b49
2018-07-23 16:01:30 -07:00
Nathan Harold
232487ff44 Merge "Access Identity and SignalStrength from CellInfo"
am: c99ced9db8

Change-Id: Ibec751dc256381a504d0366725f6d43b624f27ab
2018-07-23 15:53:55 -07:00
Nathan Harold
c99ced9db8 Merge "Access Identity and SignalStrength from CellInfo" 2018-07-23 21:35:00 +00:00
Nathan Harold
7b3f7a44af Access Identity and SignalStrength from CellInfo
Accessing common CellIdentity and CellSignalStrength
information should not require RTTI. Thus, add
overloaded methods that allow the access the common
versions of these functions from a top level CellInfo.

Bug: 10151416
Test: compilation

Change-Id: I18f31c5cec075dcd68cc493e24c2d551138dd73c
2018-07-19 15:24:14 -07:00
Hall Liu
fce4acd679 Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" 2018-07-16 22:52:10 +00:00
sqian
ea8970cd55 Call Redirection Surface in Telecom out going call flow
- Provide a Call Redirection API Surface
- Provide a key "KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING"
  in the CarrierConfigManager
- Create .aidl interfaces for Call Redirection
(CallRedirectionService.aidl, CallRedirectionAdapter.aidl)

Bug: 64959558
Test: Compile
Change-Id: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
2018-07-16 20:34:07 +00:00
Jack Yu
e3c660b841 Merge "Added documentation for network registration state" am: 3c1604da8b am: 5e7bbe01c4
am: 1d4b1172fe

Change-Id: I2ccc907907029368eec5f4c7cdcaa25eb4c62b16
2018-07-15 19:55:42 -07:00
Jack Yu
1d4b1172fe Merge "Added documentation for network registration state" am: 3c1604da8b
am: 5e7bbe01c4

Change-Id: I3a24338b43b6f1f9a704bbed1e2d472bb2a9c574
2018-07-15 19:47:08 -07:00
Jack Yu
ccd62f2295 Reordered the params for network registration
Test: Build
Bug: 73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit 7928c4d1c3)
(cherry picked from commit c683c3930e)
(cherry picked from commit d6284d9e0a)
2018-07-16 02:38:44 +00:00
Jack Yu
5e7bbe01c4 Merge "Added documentation for network registration state"
am: 3c1604da8b

Change-Id: Icf8f0fff21c1190d3bde21cdbe378d6b75b51506
2018-07-15 17:12:41 -07:00
Hall Liu
79b6840516 Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""
This reverts commit 0082b161ca.

Reason for revert: build breaks fixed

Change-Id: I75ea63ceaae6e970ce51a971c9a4635d0ce3f9e4
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-14 00:32:56 +00:00
Jack Yu
d6284d9e0a Reordered the params for network registration
Test: Build
Bug: 73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit 7928c4d1c3)
(cherry picked from commit c683c3930e)
2018-07-14 00:30:29 +00:00
Jack Yu
b494f72750 Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.

Bug: 73659459
Test: Build
Change-Id: Ia67ebf94771c7ff5f5d90f6cdd303cb2716f9186
(cherry picked from commit b4094993f7)
2018-07-13 14:50:02 -07:00
Jack Yu
1bee26f4c3 Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master 2018-07-13 19:28:23 +00:00
Jack Yu
ad9d544cb3 DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit ea440a765e, reversing
changes made to 0b90c524cb.

Test: Build
Bug: 73659459
Change-Id: I2c52f17090040cea589081c3ed412a14986e3d85
2018-07-13 10:35:30 -07:00
Treehugger Robot
f92ad05fa5 Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" 2018-07-13 16:34:30 +00:00
Yueming Wang
0082b161ca Revert "Update SubscriptionInfo o use strings for mccmnc"
This reverts commit 0c149bd2d8.

Reason for revert:  reverting this topic as it breaks several branches.

Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-13 11:15:50 +00:00
Jack Yu
f2add90de4 DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit ea440a765e, reversing
changes made to 0b90c524cb.

Test: Build
Bug: 73659459
Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e
2018-07-12 19:41:33 -07:00
Hall Liu
2656f6d049 Merge "Update SubscriptionInfo o use strings for mccmnc" am: 0babf1815c
am: 08a4eb9445

Change-Id: I0462d1de1c2622499470b00195897ce370a13020
2018-07-12 16:07:43 -07:00
Hall Liu
08a4eb9445 Merge "Update SubscriptionInfo o use strings for mccmnc"
am: 0babf1815c

Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
2018-07-12 15:22:52 -07:00
Hall Liu
0babf1815c Merge "Update SubscriptionInfo o use strings for mccmnc" 2018-07-12 21:13:16 +00:00
Nathan Harold
244c80b017 Merge "Remove Duplicate Override for Operator Alphas" am: 24eaa6ab3d am: f5f908c525
am: fe1b6deb66

Change-Id: I0f0525480e9d28142cb5ee375f834a21e6121f31
2018-07-12 14:04:52 -07:00
Nathan Harold
fe1b6deb66 Merge "Remove Duplicate Override for Operator Alphas" am: 24eaa6ab3d
am: f5f908c525

Change-Id: I9fe744ec118df8e68616d72f2c26db612b2b49a0
2018-07-12 13:26:41 -07:00
Nathan Harold
f5f908c525 Merge "Remove Duplicate Override for Operator Alphas"
am: 24eaa6ab3d

Change-Id: I15004a7df3d922ba50d187769299723e888febae
2018-07-12 12:35:18 -07:00
Jack Yu
1cbcc50d0a Merge "Revert "Added documentation for network registration state"" 2018-07-12 18:16:26 +00:00
Nathan Harold
24eaa6ab3d Merge "Remove Duplicate Override for Operator Alphas" 2018-07-12 18:08:05 +00:00
Jack Yu
7e1be05b14 Revert "Added documentation for network registration state"
This reverts commit b4094993f7.

Reason for revert: Caused merge conflict. Need to come up with a better solution.

Change-Id: Id7b7f35c25775a7a095b77a90724cf3a0f8daf7e
2018-07-12 17:39:12 +00:00
Nathan Harold
22590b06e8 Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
am: c1e5c3ea82

Change-Id: I4bbedcc3f47706d677a1c66273bf1643c8f21be5
2018-07-11 12:09:10 -07:00
Jack Yu
c683c3930e Reordered the params for network registration
Test: Build
Bug: 73659459
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit 7928c4d1c3)
2018-07-11 11:40:33 -07:00
Jack Yu
b4094993f7 Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.

Bug: 73659459
Test: Build
Change-Id: Ia7b4a53070c06edd98ae767fd6f56c4000d8e4d0
2018-07-11 11:08:48 -07:00
Nathan Harold
c1e5c3ea82 Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" 2018-07-11 17:58:50 +00:00
Hall Liu
0c149bd2d8 Update SubscriptionInfo o use strings for mccmnc
Add methods to get mcc/mnc as strings so that the leading-zero
ambiguity is resolved.

Test: manual (db update), unit tests
Bug: 35064313
Change-Id: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-10 15:51:26 -07:00
Nathan Harold
59356594d2 Remove Duplicate Override for Operator Alphas
These methods override the base class methods
and don't actually add any value. Removing them
as redundant.

Bug: 76153768
Test: telephony unit test - testCellIdentityTdscdma()
Change-Id: I98200a7198e182e6279851c51082bf625ee09fe9
2018-07-10 13:50:44 -07:00
Nathan Harold
054b79d49f Update Wcdma and Tdscdma CellInfo for HAL 1.2
In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.

Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.

-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
 the getLevel() methods of CellSignalStrength<RAT>

Bug: 76153768
Test: RILTests added for TDSCDMA
Merged-In: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
(cherry picked from commit 88f44024bb)
2018-07-10 13:24:36 -07:00
Nathan Harold
81474a3dfc Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
am: 2ac4249f8c

Change-Id: I95fb510bcb881f52dc20ff567f3e51f93b0b7290
2018-07-10 13:13:09 -07:00
Nathan Harold
2ac4249f8c Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp 2018-07-10 19:57:15 +00:00
Hall Liu
17455eb753 Merge "Update SubscriptionInfo o use strings for mccmnc" 2018-07-10 00:08:14 +00:00
Hall Liu
ff37599354 Update SubscriptionInfo o use strings for mccmnc
Add methods to get mcc/mnc as strings so that the leading-zero
ambiguity is resolved.

Test: manual (db update), unit tests
Bug: 35064313
Change-Id: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-09 13:43:42 -07:00
Nathan Harold
88f44024bb Update Wcdma and Tdscdma CellInfo for HAL 1.2
In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.

Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.

-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
 the getLevel() methods of CellSignalStrength<RAT>

Bug: 76153768
Test: RILTests added for TDSCDMA
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
2018-07-06 16:33:26 -07:00
Jordan Liu
d75e31fbce Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7 am: 50f29d8ecf
am: bf4acfb71b

Change-Id: I8d4cb6a658f2e9d09b9904c722218ef594fb694a
2018-07-06 12:25:08 -07:00
Jordan Liu
bf4acfb71b Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7
am: 50f29d8ecf

Change-Id: Ia5ee66c5f99ddd0700bc971ba895c73594e9a517
2018-07-06 12:15:49 -07:00
Jordan Liu
50f29d8ecf Merge "Type Allocation Code & Manufacturer Code"
am: ff801e5fd7

Change-Id: I95b5fd3d2fb977db3f37dcf23c2125c521c1ccd1
2018-07-06 12:06:39 -07:00
David Kelly
db6a391957 Type Allocation Code & Manufacturer Code
- Addition of getTypeAllocationCode & getManufacturerCode to
android.telephony.TelephonyManager.

- The Type Allocation Code is the first eight characters of the IMEI.
The Type Allocation Code identifies a particular GSM device model.

- The Manufacturer Code is the first eight characters of the MEID.
The Manufacturer Code identifies the manufacturer of a CDMA device.

- The reasoning behind adding getTypeAllocationCode is to be
able to obtain the Type Allocation Code without requiring the
READ_PHONE_STATE permission. Currently in order to obtain the
Type Allocation Code a substring operation must be performed on
getImei which is protected by the READ_PHONE_STATE permission.

- The reasoning behind adding getManufacturerCode is to be
able to obtain the Manufacturer Code without requiring the
READ_PHONE_STATE permission. Currently in order to obtain the
Manufacturer Code a substring operation must be performed on
getMeid which is protected by the READ_PHONE_STATE permission.

- The reasoning that these additional methods do not require the
READ_PHONE_STATE permission is that neither the Type Allocation
Code nor the Manufacturer Code can identify a unique device.
The Type Allocation Code and the Manufacturer Code are analogous
to other device information such as device model or device
screen dimensions.

Test: run cts -m CtsTelephonyTestCases
Bug: 74613795
Change-Id: I5a586b5a362b39aae13357329efb19eb93f0434c
Signed-off-by: David Kelly <dkelly@afilias.info>
2018-07-04 08:23:09 +00:00
Tyler Gunn
8469a998c2 Merge "ImsMultiEndPoint - Sip Notify Change" am: bc103bdf18 am: 4a319c85bd
am: 98138a2837

Change-Id: I2662ae0934dfa2ed9990ba69093c4455d1966332
2018-07-03 17:09:58 -07:00