Commit Graph

6402 Commits

Author SHA1 Message Date
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
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
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
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
4a319c85bd Merge "ImsMultiEndPoint - Sip Notify Change"
am: bc103bdf18

Change-Id: I2dbc17af8694cdb92e189202e0786fc39573b0d1
2018-07-03 16:27:56 -07:00
Sumit Das
c9373d843e ImsMultiEndPoint - Sip Notify Change
-Added log message, getter method and set/read from parcel

Change-Id: I832bd2cf51382bb0919ab0ea1b5c7fcba8b2b136
2018-07-03 21:41:03 +00:00
Treehugger Robot
38f7576297 Merge "Reordered the params for network registration" 2018-07-02 23:56:11 +00:00
Nathan Harold
0571b04c3a Merge "Update Docstrings for CellSignalStrengthLte"
am: 5e8a5d4b79

Change-Id: Id41fb2ccdeaf43fcc62193c78c93f4ca765d2fa2
2018-07-02 16:07:37 -07:00
Nathan Harold
5e8a5d4b79 Merge "Update Docstrings for CellSignalStrengthLte" 2018-07-02 20:40:55 +00:00
Jack Yu
a916542011 Merge "Used APN type instead of APN id"
am: 2e371c1b5a

Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
2018-06-29 18:06:39 -07:00
Jack Yu
2e371c1b5a Merge "Used APN type instead of APN id" 2018-06-29 23:54:32 +00:00
Nathan Harold
3b08d8ff77 Merge changes I0d635067,I1424973b
am: 4d7a010983

Change-Id: I4372305da9b4b6b488bdeda0ec97b412e92bce58
2018-06-29 15:39:19 -07:00
Jack Yu
bfa6635c30 Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.

Test: Telephony sanity tests + unit tests
Bug: 77511388
Merged-In: If41845604ea14f36272262da110d682eea0d5451
Change-Id: If41845604ea14f36272262da110d682eea0d5451
(cherry picked from commit f42d06010a)
2018-06-29 14:52:52 -07:00
Nathan Harold
4d7a010983 Merge changes I0d635067,I1424973b
* changes:
  Simplify equals() method of ServiceState
  Update ServiceState.hashCode()
2018-06-29 21:23:26 +00:00
Amit Mahajan
d7a5190868 Merge "Add new carrier config for CDMA registered PLMN when not roaming."
am: c8eb9ef591

Change-Id: I1cc5af7ab6cbb722c14b549047cccd73a5ad9720
2018-06-29 14:05:51 -07:00
Amit Mahajan
ab790a123b Add new carrier config for CDMA registered PLMN when not roaming.
Test: manual
Bug: 80145031
Merged-in: I6533b4097f729df88f287348924563c6f459401c
Change-Id: I6533b4097f729df88f287348924563c6f459401c
(cherry picked from commit 22e89f4773)
2018-06-29 11:02:56 -07:00
Brad Ebinger
86ec65e59c Merge "Emergency SMS carrier config flag"
am: 36a9fa62be

Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017
2018-06-28 17:26:39 -07:00
Jack Yu
7928c4d1c3 Reordered the params for network registration
Test: Build
Bug: 73659459
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
2018-06-28 15:29:08 -07:00
Brad Ebinger
36a9fa62be Merge "Emergency SMS carrier config flag" 2018-06-28 22:16:10 +00:00
Nathan Harold
9ca4d43922 Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" 2018-06-28 22:05:56 +00:00
Nathan Harold
df54d98be6 Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.

Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.

Bug: 110806860
Test: manual - ran with SL4A as SYSTEM_UID and
    verified access to getAllCellInfo.

Merged-In: Ie18be2cd72c49f1859d1434428f82f164bed8756
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
2018-06-28 19:09:51 +00:00
Nathan Harold
7ee5f2185d Simplify equals() method of ServiceState
For whatever reason, ServiceState used a
somewhat-convoluted check for null and
class type. Updating to use a canonical
and brief approach.

Bug: 8675309
Test: compilation
Change-Id: I0d635067a06093affff478e13c28bbbe2bfda7df
2018-06-27 18:55:49 -07:00
Nathan Harold
b220fde296 Update ServiceState.hashCode()
hashCode() was missing about 10 fields and was
using some unnecessary bespoke logic to generate
hashes for individual fields. This CL simplifies
the hashCode() implementation and adds the missing
fields.

Bug: 8675309
Test: compilation
Change-Id: I1424973b11fcc6480d6f8c83d5fd0eb1b5533c7f
2018-06-27 17:13:03 -07:00
Tyler Gunn
206bacb18b Merge "ImsMultiEndPoint - Sip Notify Change"
am: af228ca978

Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
2018-06-27 15:28:10 -07:00
Nathan Harold
998c416213 Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master 2018-06-27 20:02:59 +00:00
Tyler Gunn
af228ca978 Merge "ImsMultiEndPoint - Sip Notify Change" 2018-06-27 20:02:37 +00:00
Brad Ebinger
0397b9b65d Merge "Telephony: Introduce a base class for ISMS.aidl."
am: f03b8e2471

Change-Id: I2c155c6bb46baa411f531e411f86efe0e56c20dc
2018-06-27 12:46:39 -07:00
Nathan Harold
2cdcd98379 Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.

Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.

Bug: 110806860
Test: manual - ran with SL4A as SYSTEM_UID and
    verified access to getAllCellInfo.

Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
2018-06-27 18:52:15 +00:00
Brad Ebinger
f03b8e2471 Merge "Telephony: Introduce a base class for ISMS.aidl." 2018-06-27 18:24:51 +00:00
Avinash Nalluri
ceaf7226cf Emergency SMS carrier config flag
Allow send sms over ims to emergency number when the device is in
lte/limited lte mode without normal ims registration.
Modem will use emergency ims pdn to submit sms to network.

Change-Id: I5762102c695fe309a4a5b318abccded5c50154e0
Bug: 110462046
2018-06-27 08:46:54 -07:00
Nathan Harold
bace6e3132 Update Docstrings for CellSignalStrengthLte
Add comments to the docstrings to indicate optional
values that may not always be reported. Users are
still reporting bugs for missing fields, which we
consider optional. This should clarify which methods
are optional vs mandatory for LTE.

For signal strength, RSRP is mandatory, and TA is
mandatory while in LTE_ACTIVE. RSSNR, RSRQ, and CQI
are all optional.

Bug: 36995487
Test: compilation (docstring-only change)
Change-Id: I05af5d42cbf6836109efe6441e95223e81671534
2018-06-26 17:21:28 -07:00
Ajay Nambi
0bfe9438b1 Telephony: Introduce a base class for ISMS.aidl.
Add a dummy base class implementation for
AIDL APIs defined. Clients can override the
required APIs.

Bug: 73994017
Change-Id: Ifd14e04ae0467a7b963cd993cfd514660f14fa95
2018-06-26 22:54:03 +00:00
Tyler Gunn
690f008e3f Merge "Update onDeregistered docs to make capability change expectations clear." 2018-06-26 21:14:27 +00:00
Amit Mahajan
12b08d00b8 Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
am: 3838ff457e

Change-Id: I46a8a708e949e134b8e4cb05fe315b058ad500fc
2018-06-25 16:31:55 -07:00
Treehugger Robot
3838ff457e Merge "Update comments for TelephonyManager.getUiccSlotsInfo()" 2018-06-25 22:22:25 +00:00
Brad Ebinger
057f582e09 Merge "Fix Possible Deadlock with getFeatureState"
am: 6bebb8418c

Change-Id: I675c116e54d961971d4a32f87dd247cca51b5069
2018-06-25 11:45:32 -07:00
Brad Ebinger
6bebb8418c Merge "Fix Possible Deadlock with getFeatureState" 2018-06-25 17:30:02 +00:00
Brad Ebinger
8f074959e5 Fix Possible Deadlock with getFeatureState
Use the ImsFeature lock for concurrency in MmTelFeature
instead of declaring its own lock.

Also, fixed up some other concurrency code.

Bug: 110507525
Test: Manual, Telephony Unit Tests
Change-Id: I5a7ef1beca619873a7c228bed0e1b82843d4de63
2018-06-22 16:14:17 -07:00
Sumit Das
0c7adfae2a ImsMultiEndPoint - Sip Notify Change
-Propagate the local-identity field to AOSP to help differentiate
between local calls and calls on secondary devices

Change-Id: I78c8f721dcffa167c7d65c474f13a8a377e4cd39
2018-06-22 16:08:57 -07:00
Jack Yu
5ae46260e4 Merge "Removed dead code in DcTracker"
am: a0b9309ba2

Change-Id: I807835bcc1194f695e5fb30098cc82f50fef5d59
2018-06-21 20:28:45 -07:00