Commit Graph

6420 Commits

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

Change-Id: I6516ead9bfb3aa6b7c2d460fdab8de076cd07876
2018-07-03 16:36:52 -07: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
275d5a5cb0 Merge "Update Docstrings for CellSignalStrengthLte" am: 5e8a5d4b79
am: 0571b04c3a

Change-Id: I52a3de4f89b3a59cb4f33263cb5838d37fb0a7fb
2018-07-02 16:17:52 -07: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
SongFerng Wang
fce00ebc0a Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am: d7b5946628

Change-Id: I7f11346be248bd325f14d7039f5a5d5b2f45617a
2018-06-29 23:34:15 -07:00
SongFerng Wang
d7b5946628 Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev 2018-06-30 06:22:12 +00:00
Jack Yu
8f76322f75 Merge "Used APN type instead of APN id" am: 2e371c1b5a
am: a916542011

Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db
2018-06-29 18:40:06 -07:00
SongFerngWang
060571655e add three new carrier configs for call forwarding, Caller ID and Call Waiting.
The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.

Bug: 110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
    and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
    and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
    no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)

Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71
2018-06-30 09:14:58 +08: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
dcfa685cad Merge changes I0d635067,I1424973b am: 4d7a010983
am: 3b08d8ff77

Change-Id: I323c57f0ad262a5875fcac7370dfb75d116f4bca
2018-06-29 15:46:45 -07: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
Amit Mahajan
93c577b224 Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
am: fffc308084

Change-Id: I813c193b1c9d68f524ad74d21f0616516edc18d6
2018-06-29 10:34:33 -07:00
TreeHugger Robot
fffc308084 Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev 2018-06-29 17:23:13 +00:00
Brad Ebinger
0bb18995dc Merge "Emergency SMS carrier config flag" am: 36a9fa62be
am: 86ec65e59c

Change-Id: I63df676bf2270532c84cb950e4cac13858fbd4fb
2018-06-28 17:34:48 -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
05902faa8b Merge "ImsMultiEndPoint - Sip Notify Change" am: af228ca978
am: 206bacb18b

Change-Id: I66364e0e5213410595ec110c422125b2c93f0411
2018-06-27 15:38:13 -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
d9a7a59007 Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
am: 998c416213

Change-Id: I352b53ac10fed126a9e585bc1d3de1430a8cff4f
2018-06-27 13:12:23 -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
42bf3bef2b Merge "Telephony: Introduce a base class for ISMS.aidl." am: f03b8e2471
am: 0397b9b65d

Change-Id: Ib946404b724ddfaceae06eb5d6026137052dcb7b
2018-06-27 12:55:04 -07: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
Andrew Sapperstein
d8a7b012a0 Merge "Hide system apps until installed (1/2)" into pi-dev
am: 70a9f39e6a

Change-Id: Ide5ea4b18ca95ee061bf84cb349369b2468504d1
2018-06-26 13:19:57 -07:00
Rhed Jao
c19da78203 Hide system apps until installed (1/2)
Applying this mechanism for system carrier apps to make visibility
reasonable from the user's perspective. In other words, before
hidden system apps have been installed, they wouldn't be listed
via APIs in PackageManager which are used at all apps list and
search in Settings and so on.

Test: atest CarrierAppUtilsTest
Test: atest PackageManagerTest
Test: cts DeviceOwnerTest
Test: gts ManagedProfileProvisioningHostsideTest
Bug: 74068582
Change-Id: I1f23aba589b98351a1871a44a3058b67c416f351
2018-06-26 02:21:10 +00:00
Amit Mahajan
6790ba2a59 Merge "Update comments for TelephonyManager.getUiccSlotsInfo()" am: 3838ff457e
am: 12b08d00b8

Change-Id: Ibee5837f9db34c48d705e4e92673572c43d1eb49
2018-06-25 16:41:09 -07: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