Commit Graph

7672 Commits

Author SHA1 Message Date
Hall Liu
129d9d07a6 Merge "Add fields for PhoneAccount to CallerInfo" am: 833bc7dba7 am: 5c8e7355c0
am: b34a301827

Change-Id: I2b1712e6b8158b3ea1b9ed8411b6fb9a0ab5481d
2018-12-11 16:55:49 -08:00
Brad Ebinger
ea93adecf8 Merge "Changes to IMS SS API to better fit API standards/" am: 91bd02534a am: 6825dce3fb
am: 15a54c386f

Change-Id: I19d878aee8e8e212015465aa31f3a35991b303fd
2018-12-11 16:47:09 -08:00
Hall Liu
b34a301827 Merge "Add fields for PhoneAccount to CallerInfo" am: 833bc7dba7
am: 5c8e7355c0

Change-Id: I27b8b353ae912cb9e301645aadcdd4433a761553
2018-12-11 16:32:34 -08:00
Brad Ebinger
15a54c386f Merge "Changes to IMS SS API to better fit API standards/" am: 91bd02534a
am: 6825dce3fb

Change-Id: Ib4341edece2bc0b1730ccd4e6c8312bca701aefa
2018-12-11 16:26:31 -08:00
Hall Liu
833bc7dba7 Merge "Add fields for PhoneAccount to CallerInfo" 2018-12-11 22:58:45 +00:00
Brad Ebinger
91bd02534a Merge "Changes to IMS SS API to better fit API standards/" 2018-12-11 22:57:26 +00:00
Pengquan Meng
cd9df483d4 Merge "Modify constructor of NetworkRegistrationState" am: 61c09d128b
am: 070ab3d85e

Change-Id: Ia5ff1964024331eac272a8ef4e536153e942cd7f
2018-12-10 18:53:41 -08:00
Hall Liu
7d02a835ae Add fields for PhoneAccount to CallerInfo
Add fields to specify which outgoing phone account is stored in the
contacts db within the CallerInfo object.

Bug: 111455117
Test: manual, unit
Change-Id: Id402102e4605f6b414188a3eaf6442cf4282fcab
2018-12-10 18:46:07 -08:00
Pengquan Meng
61c09d128b Merge "Modify constructor of NetworkRegistrationState" 2018-12-11 02:26:19 +00:00
Xiangyu/Malcolm Chen
fe09b5f332 Merge "Deactivate bundled opportunistic subscription." am: 69a618fb5b
am: 906dd13d0d

Change-Id: I8bc6986f0a010bfc8b937fbf46a475d3efcbb81c
2018-12-10 17:16:42 -08:00
Xiangyu/Malcolm Chen
69a618fb5b Merge "Deactivate bundled opportunistic subscription." 2018-12-11 00:42:34 +00:00
Pengquan Meng
73596cb5e9 Modify constructor of NetworkRegistrationState
This change the data specific constructor of NetworkRegistrationState to
make it adapt to the new NR indicators.

Bug: 111453000
Test: atest FrameworksTelephonyTests
Merged-In: I4e1f30ea8531a6a424c2c920c74257d4d673589d
Change-Id: I4e1f30ea8531a6a424c2c920c74257d4d673589d
2018-12-10 15:36:52 -08:00
Pengquan Meng
41c1d31677 Merge "Add 5G rat type" am: 8f9f382c9c
am: 411ea19296

Change-Id: Ie9cdb0b41815b7ed70c4d568d0eaf4dd9ab047e9
2018-12-10 14:30:58 -08:00
Shuo Qian
473b204fa6 Merge "EmergencyNumber enhancement" 2018-12-10 22:13:41 +00:00
Malcolm Chen
d86d02a281 Deactivate bundled opportunistic subscription.
When primary subscription is disabled, also deactivate
its bundled opportunistic subscription.

Bug: 118349116
Test: unittest
Change-Id: I04cb89b8cc2d03836878866d2975af186de42468
Merged-In: I04cb89b8cc2d03836878866d2975af186de42468
2018-12-10 14:02:58 -08:00
Pengquan Meng
8f9f382c9c Merge "Add 5G rat type" 2018-12-10 22:00:35 +00:00
Pengquan Meng
fdb93e88dd Merge "Fix doc of NETWORK_TYPE_NR & add converter" 2018-12-10 21:58:55 +00:00
Jordan Liu
c785a07598 Merge "Add new key for carrier configuration version" am: 06dcff96e4 am: a39793b22f
am: 5b7f382bb5

Change-Id: I072198acd59558bfd730c22c92cc5fb1e00e2382
2018-12-10 13:38:03 -08:00
Jordan Liu
5b7f382bb5 Merge "Add new key for carrier configuration version" am: 06dcff96e4
am: a39793b22f

Change-Id: I67b773ba0f0ed66d7512d01551e13fb597c286a8
2018-12-10 12:54:57 -08:00
Jordan Liu
06dcff96e4 Merge "Add new key for carrier configuration version" 2018-12-10 20:23:09 +00:00
sqian
9f93a12e1f EmergencyNumber enhancement
Patch set 1-2:
1) Add Database source for EmergencyNumber
2) add mergeEmergencyNumber for merging two emergency numbers

Patch set 3-5:
3) enable Listener.EmergencyNumber enhancement

Patch set 6:
4) no need to pass any parameter to PhoneNotifier
5) modify API documentation

Patch set 9:
6) deprecate PhoneNumberUtils.isEmergencyNumber
7) modify API documentation for security exception and backward
compatibility
9) introduce some utils in EmergencyNumber for merging number purposes

Patch set 12:
10) add mnc into EmergencyNumber

Bug: 112657134
Test: Treehugger
Change-Id: I0dcd01bdad7d9c37294cd8b87eda54b4ac9d0a0b
2018-12-10 10:46:39 -08:00
Shuo Qian
fb203f236d Merge "Frame EmergencyNumber notifier in TelephonyRegistry" am: 6987e27aa6
am: 90c8797659

Change-Id: Ic19775fbd3e9c3aa5bdd8f2c24a2f8899695a46e
2018-12-07 21:44:19 -08:00
sqian
bf165bc25d Frame EmergencyNumber notifier in TelephonyRegistry
Test: Treehugger
Bug: 112657134
Change-Id: I9e2e0348b8e0e9ac473db354023a242087fbb2c3
Merged-In: I9e2e0348b8e0e9ac473db354023a242087fbb2c3
(cherry picked from commit bdc5a733b7)
2018-12-07 17:09:39 -08:00
Pengquan Meng
3955593f7e Fix doc of NETWORK_TYPE_NR & add converter
This fix some documents related to NETWORK_TYPE_NR and add a converter
from ril rat to NETWORK_TYPE_NR.

Bug: 111453000
Test: build
Change-Id: Ib9ee0dbe0234ef1bf9ef22900b00ddd47195914f
2018-12-07 14:45:22 -08:00
Pengquan Meng
f5425603bf Merge "A get method for NR status in ServiceState" 2018-12-07 22:04:03 +00:00
Pengquan Meng
6b849c2acd Add 5G rat type
This add a new rat type for 5G.

Bug: 111453000
Test: build
Merged-In: I57366a1a9f61278cf752c25d54a1af1830bf4575
Change-Id: I57366a1a9f61278cf752c25d54a1af1830bf4575
2018-12-07 21:44:58 +00:00
Brad Ebinger
c9a6aab65d Changes to IMS SS API to better fit API standards/
Bug: 120072087
Test: Manual
Change-Id: Ibcc9b2a39f3f736cf385343aa1ab82174ea73a39
2018-12-07 13:22:01 -08:00
Michele Berionne
8ac8bd28f4 Add new key for carrier configuration version
Add new key to retrieve the carrier configuration version, so that it
can be displayed to the user.

Bug: 116527591
Test: Verified compilation.
Change-Id: I43a07faa41a925d8928d9c1fa59b9a01d08eb815
2018-12-07 13:12:34 -08:00
Pengquan Meng
bbcd9123aa A get method for NR status in ServiceState
Bug: 111453000
Test: build
Change-Id: I07749ff00fc9d53796208ca78721b498ed4c16fd
2018-12-06 17:48:08 -08:00
Hall Liu
08c58d6f6d Merge "Fix validation problem in PhoneNumberRange" am: 85d5a309ca am: 97fd2d5686
am: dcece7c289

Change-Id: Ia39dc5bd151c3da50738e916527333c849bc53dc
2018-12-06 16:43:16 -08:00
Chen Xu
eff2277802 Merge "address API council feedbacks for Telephony.Carriers" am: 310b9ea8d5
am: b78f02e157

Change-Id: I0daca5a31683cd9889e724b99d3c1cc6cdec38ca
2018-12-06 16:38:49 -08:00
Pengquan Meng
687a6839b8 Merge "Add carrier config for 5G Icon" 2018-12-07 00:37:46 +00:00
Hall Liu
dcece7c289 Merge "Fix validation problem in PhoneNumberRange" am: 85d5a309ca
am: 97fd2d5686

Change-Id: I8c6bb6a8e62c1f27213d5ee898f69de811180c17
2018-12-06 16:32:01 -08:00
Chen Xu
310b9ea8d5 Merge "address API council feedbacks for Telephony.Carriers" 2018-12-06 21:45:47 +00:00
Xiangyu/Malcolm Chen
43fbca63ac Merge "Deactivate bundled opportunistic subscription." 2018-12-06 21:17:36 +00:00
Hall Liu
85d5a309ca Merge "Fix validation problem in PhoneNumberRange" 2018-12-06 21:05:57 +00:00
Chen Xu
4205562972 Merge "address API council feedbacks for Telephony.Carriers" 2018-12-06 20:11:18 +00:00
Pengquan Meng
dfb3956cf1 Add carrier config for 5G Icon
Bug: 111453000
Test: build
Change-Id: Ie4b331aaec3981dea0eeada436a2123fe9287b74
2018-12-06 11:07:40 -08:00
TreeHugger Robot
4d50e4990c Merge "Fix typo according to API review." 2018-12-06 00:55:30 +00:00
Hall Liu
a1ea5d753c Fix validation problem in PhoneNumberRange
Regexes weren't matching empty strings (which are perfectly valid) for
the various arguments in the ranges. Fix it so that they do match.

Bug: 119675160
Test: GTS
Change-Id: I4ea0f65b62af9fd35612e5261e01b2bea07c8ddc
2018-12-05 13:57:42 -08:00
Sooraj Sasindran
8e9bf61074 Merge "UpdateAvailableNetworks apis" am: c3d4693f79
am: ee244266ce

Change-Id: Ifaeb0562b2f49e75fcf356f3c71d8fc4cc91701f
2018-12-05 11:48:26 -08:00
Hall Liu
2725edc3d2 Merge "Add AIDL for number verification request API" am: 9814a10f42 am: 08877eba7f
am: 0aa7e03d08

Change-Id: I3c9aca811fe448cfd8a53b0a1eef4f631b655947
2018-12-05 11:35:59 -08:00
Treehugger Robot
c3d4693f79 Merge "UpdateAvailableNetworks apis" 2018-12-05 19:16:39 +00:00
Hall Liu
0aa7e03d08 Merge "Add AIDL for number verification request API" am: 9814a10f42
am: 08877eba7f

Change-Id: Iac61f5c4b79d8a3e5a5b5bad830d87ba1dbf6974
2018-12-05 11:12:26 -08:00
Chen Xu
4988e08c6d Merge "support per carrier based iso country code." am: 79db2b093a
am: ee4cfc350d

Change-Id: I511bcc5ed4153621194097ce1dfa97efcf8e3f02
2018-12-05 11:00:45 -08:00
Hall Liu
9814a10f42 Merge "Add AIDL for number verification request API" 2018-12-05 18:29:47 +00:00
Chen Xu
79db2b093a Merge "support per carrier based iso country code." 2018-12-05 18:03:08 +00:00
Shuo Qian
946d90b724 Merge "Make some SubscriptionManager APIs system APIs" 2018-12-05 17:36:54 +00:00
Holly Jiuyu Sun
1c7bd090c9 Fix typo according to API review.
invoke -> invoked

Bug: 120489209
Test: make
Change-Id: I4c1cc7badf3646e970272a663922a0ae98988cab
2018-12-04 20:44:16 -08:00
Pengquan Meng
3ac37ebca6 Merge "Add FrequencyRange comparator to ServiceState" 2018-12-05 04:10:03 +00:00