Commit Graph

3869 Commits

Author SHA1 Message Date
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
4b12916e79 Merge changes I0d635067,I1424973b am: 4d7a010983 am: 3b08d8ff77
am: dcfa685cad

Change-Id: I683f6f829ee106196eb266b5bdb7ee450c259c02
2018-06-29 15:59:58 -07: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
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
TreeHugger Robot
e90533787d Merge "Used APN type instead of APN id" 2018-06-29 20:30:51 +00: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
304c3b3b8a Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev am: fffc308084
am: 93c577b224

Change-Id: Ie635c49b097d758c96e882249a4b0ad61c85b730
2018-06-29 10:53:14 -07:00
Jack Yu
f42d06010a 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
Change-Id: If41845604ea14f36272262da110d682eea0d5451
2018-06-29 10:34:48 -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
b599d73b8c Merge "Emergency SMS carrier config flag" am: 36a9fa62be am: 86ec65e59c
am: 0bb18995dc

Change-Id: I4bc7ca9080af8f0bd06c4ab0fe547640314819e1
2018-06-28 17:43:48 -07: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
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
2eb94adb0f Merge "ImsMultiEndPoint - Sip Notify Change" am: af228ca978 am: 206bacb18b
am: 05902faa8b

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

Change-Id: I2e577b36fbc50f7df92d1e0aad9e837219944597
2018-06-27 13:21:36 -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
Tyler Gunn
af228ca978 Merge "ImsMultiEndPoint - Sip Notify Change" 2018-06-27 20:02:37 +00: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
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
Tyler Gunn
690f008e3f Merge "Update onDeregistered docs to make capability change expectations clear." 2018-06-26 21:14:27 +00:00
Amit Mahajan
ee44571c34 Merge "Update comments for TelephonyManager.getUiccSlotsInfo()" am: 3838ff457e am: 12b08d00b8
am: 6790ba2a59

Change-Id: Ie080da96f604462ec30c1c10752707d402a547d6
2018-06-25 17:10:30 -07: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
Brad Ebinger
5c096e64ba Merge "Fix Possible Deadlock with getFeatureState" am: 6bebb8418c am: 057f582e09
am: 9296dcff69

Change-Id: I22b387d5437ec62d8ba0d6ca869e86772fc44efb
2018-06-25 12:05:12 -07:00
Brad Ebinger
9296dcff69 Merge "Fix Possible Deadlock with getFeatureState" am: 6bebb8418c
am: 057f582e09

Change-Id: I3cb9d6457c0348739e57802099c51b0308bbe05d
2018-06-25 11:53:41 -07: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
Chen Xu
1b18b39206 Merge "support privilege access rule for carrier identification" 2018-06-22 23:48:29 +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
Amit Mahajan
22e89f4773 Add new carrier config for CDMA registered PLMN when not roaming.
Test: manual
Bug: 80145031
Change-Id: I6533b4097f729df88f287348924563c6f459401c
2018-06-22 12:49:49 -07:00
Tyler Gunn
4b2f358282 Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." into pi-dev am: 766259698a
am: d26a8a408e

Change-Id: I55e3519fcbad4dcb7da041d0194bf4e1c7d38949
2018-06-21 11:35:12 -07:00
Tyler Gunn
d26a8a408e Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." into pi-dev
am: 766259698a

Change-Id: Ic5051c6b01eddd001681d1addd0eeee2562c59ba
2018-06-21 11:26:49 -07:00
Tyler Gunn
766259698a Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." into pi-dev 2018-06-21 18:10:16 +00:00
Tyler Gunn
1c27bb7a54 Update docs and ensure PHONE_STATE is more predictable for unknown numbers.
In P the PHONE_STATE broadcast behavior changed due to new permission
requirements.  Updating the API docs for this broadcast to make it more
clear to developers how the broadcast will work given different permission
scenarios.

Also, made a minor change to how the "EXTRA_INCOMING_NUMBER" is populated
on the phone state broadcast.  Originally we opted to remove
EXTRA_INCOMING_NUMBER when the number is empty.  Developer feedback reveals
it is difficult to know for an unknown caller (where numer is empty)
whether the broadcast they're receiving is the one associated with the
broadcast for receivers with READ_CALL_LOG, or the one for receivers
without it.  This minor change eliminates the need to count broadcasts and
instead allows the developer to just focus on whether the extra is present
or not.

Test: make docs and verify the javadoc appears as expected.
Test: Used test app to confirm functionality.
Bug: 110190165
Change-Id: I35967d53274b99d66b63f4ff5acb60a689745f9d
2018-06-20 08:50:58 -07:00
Brad Ebinger
0418143f6d Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev
am: 4cc443ae2e

Change-Id: I9c8cc1c4401590865f33fa13402152287063cecf
2018-06-19 16:13:53 -07:00
Brad Ebinger
5f05f1e405 Revert isResolvingImsBinding ITelephony interface
Reverting the only user of this interface.

Bug: 109762920
Test: GTS/Unit tests for ImsService
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
Merged-In: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
2018-06-19 19:54:43 +00:00
Brad Ebinger
69e0e0e677 Revert isResolvingImsBinding ITelephony interface
Reverting the only user of this interface.

Bug: 109762920
Test: GTS/Unit tests for ImsService
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
2018-06-19 09:49:31 -07:00
Jack Yu
42a56e43ad Merge "Fixed the incorrect permission for data/network service binding" am: a9bf7a8810 am: 65c04cd491
am: 574b298e9e

Change-Id: Ib69ec8bd57533112fcda72927db49c58619cf7ee
2018-06-18 19:07:15 -07:00
Jack Yu
574b298e9e Merge "Fixed the incorrect permission for data/network service binding" am: a9bf7a8810
am: 65c04cd491

Change-Id: I67a28d628e14798dc8d31a20536f2248c8cc0b8f
2018-06-18 18:57:57 -07:00