Commit Graph

4910 Commits

Author SHA1 Message Date
chen xu
0034bb393c add carrierid in subscriptionInfo
add carrierid in subscritionInfo so that apps can get
subId, carrierid and other sim related info from a single call

Bug: 119676543
Test: gts SubscriptionInfoTest
Change-Id: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
2018-12-15 01:28:46 +00:00
Xiangyu/Malcolm Chen
e1819858d3 Merge "Fix broken building offline-sdk-docs." 2018-12-13 01:12:09 +00:00
Michele Berionne
fe07ee9128 Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" am: ac9e1f5580 am: e4176ca234
am: eda9958c6d

Change-Id: Ief7fe2af1bc4bbf6b6028d5a801c1929c5f7a3a6
2018-12-12 11:46:41 -08:00
Michele Berionne
eda9958c6d Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" am: ac9e1f5580
am: e4176ca234

Change-Id: Idf096efcf9e5301e006cd144f3c31d7c5b5d670d
2018-12-12 11:36:25 -08:00
Michele Berionne
ac9e1f5580 Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" 2018-12-12 18:58:28 +00:00
Malcolm Chen
4d2dbe2015 Fix broken building offline-sdk-docs.
TelephonyManager#hasCarrierPrivileges(int) is hidden API so it
shouldn't be referenced in public API descriptions.

Bug: 120622105
Test: none
Change-Id: Ia6b6ec2c16b824b8eb092920089cb77cdc54bfb7
2018-12-12 10:29:16 -08:00
Chen Xu
b21a629f0b Merge "expose Carrier Id related APIs" 2018-12-12 18:02:52 +00:00
Adrian Roos
d4f9f9f666 Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5
am: 963172ac83

Change-Id: I2251db66ef73d5b69c84b4e83f2788d2bc953eda
2018-12-12 08:44:43 -08:00
Adrian Roos
6115769c16 API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Merged-In: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-12 15:02:26 +01:00
Adrian Roos
e77ff79fdb Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" 2018-12-12 13:43:34 +00:00
Xiangyu/Malcolm Chen
04db03d05c Merge "Add APIs to indicate which subscriptions should be hidden from user" 2018-12-12 07:20:12 +00:00
Xiangyu/Malcolm Chen
7475d9fc09 Merge "Add APIs to remove sub from a group and get subs in the same gorup." 2018-12-12 03:50:16 +00:00
Josh Hou
c3a79dcf45 Merge "Print carrier Id information in toString()" 2018-12-12 02:51:24 +00: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
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
Brad Ebinger
91bd02534a Merge "Changes to IMS SS API to better fit API standards/" 2018-12-11 22:57:26 +00:00
Malcolm Chen
e046dd537f Add APIs to indicate which subscriptions should be hidden from user
Bug: 120573892
Test: manual
Change-Id: I46b20241b71fef2938d7340fcf0b02173d83ed87
2018-12-11 13:55:25 -08:00
Malcolm Chen
18ef837bc6 Add APIs to remove sub from a group and get subs in the same gorup.
Add APIs in SubscriptionController so that caller with permissions
can remove subscriptions from a group or get all subscriptions with
the same group.

Bug: 118349116
Test: unittest
Change-Id: Iba4d31b437b372b3f41a6ed23f03b96a685a324c
2018-12-11 12:57:38 -08:00
Adrian Roos
66f859135b API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-11 20:38:02 +01:00
chen xu
d47a06836c expose Carrier Id related APIs
1. expose public API for preciseCarrierId and preciseCarrierIdName
2. expose public API for carrier id in CarrierIdentifier
3. New public broadcast for precise carrier identity changed
4. clean up

Bug: 110559381
Test: unit test & atest CtsTelephonyTestCases:TelephonyManagerTest
Change-Id: I18f8bc3252632bba699829c6c577d1041335fee9
2018-12-11 11:28:49 -08:00
Michele Berionne
a04da3ede8 Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING
Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING, so that
it can be used by applications.

Bug: 116527591
Test: Verified compilation.
Change-Id: I6ca2c89ed68ac190dc14a39ae4d9102632ad000a
2018-12-11 10:58:05 -08:00
Pengquan Meng
cd9df483d4 Merge "Modify constructor of NetworkRegistrationState" am: 61c09d128b
am: 070ab3d85e

Change-Id: Ia5ff1964024331eac272a8ef4e536153e942cd7f
2018-12-10 18:53:41 -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
Josh Hou
d14a0822aa Print carrier Id information in toString()
Bug: 115709816
Test: Build pass
Change-Id: Idd3336c472860ad21121029abecb91aa9b8325ec
2018-12-09 10:58:06 +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