Commit Graph

7704 Commits

Author SHA1 Message Date
Shuo Qian
63beeeaded Merge "Add Emergency Dial into RIL and Remove PhoneNumberUtils Ecclist check" 2018-12-13 23:42:14 +00:00
Youming Ye
93f07e207a Merge "Fix property setting with failure" am: da9de2d7fa am: 58be59a233
am: bab83ccabb

Change-Id: I7729325710e1b4b9d4fa08e719aba6021acb90d3
2018-12-13 14:53:18 -08:00
Youming Ye
bab83ccabb Merge "Fix property setting with failure" am: da9de2d7fa
am: 58be59a233

Change-Id: Ia3994b3595d6ccd945dc9ca45f7fc4c46c12908a
2018-12-13 13:53:07 -08:00
Chen Xu
7d97bf04c4 Merge "move and rename DcFailCause to DataFailCause" 2018-12-13 18:28:00 +00:00
Sahin Caliskan
a37ca569b0 Merge "Move RCS APIs to android.telephony.ims" 2018-12-13 16:30:20 +00:00
chen xu
bf90db5e06 move and rename DcFailCause to DataFailCause
Bug: 119891533
Test: Build
Change-Id: I6f0e474a9ee3f8befc8b0a221713a2080b59844c
2018-12-12 23:10:14 -08:00
Youming Ye
da9de2d7fa Merge "Fix property setting with failure" 2018-12-13 06:55:25 +00:00
Jordan Liu
6f6fbb09db Merge "Add API to get card ID for default eUICC" am: 97c68169b8 am: b957efea96
am: f59b035894

Change-Id: I873ce26013e2c9f4fa84b4fef07f33a5be983247
2018-12-12 21:07:19 -08:00
Jordan Liu
f59b035894 Merge "Add API to get card ID for default eUICC" am: 97c68169b8
am: b957efea96

Change-Id: Ic2f23ca2bd7721468207de9e3342d7808bf87fd3
2018-12-12 20:28:30 -08:00
Xiangyu/Malcolm Chen
e1819858d3 Merge "Fix broken building offline-sdk-docs." 2018-12-13 01:12:09 +00:00
sqian
6279e97c43 Add Emergency Dial into RIL and Remove PhoneNumberUtils Ecclist check
Bug: 112657134
Test: Treehugger
Change-Id: I297334be370688fd9a9d46920a09152f57152039
2018-12-12 16:49:57 -08:00
Jordan Liu
97c68169b8 Merge "Add API to get card ID for default eUICC" 2018-12-12 22:20:03 +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
Sahin Caliskan
84dd3061d9 Move RCS APIs to android.telephony.ims
This is due to being compatible with other RCS related changes by breadley@

Reviwed in aosp/840289, CP'ed here due to merge conflict.

Test: Existing tests pass

Bug: 109759350
Change-Id: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
2018-12-12 16:05:06 +00: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
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
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
Jordan Liu
2fe9e3748a Add API to get card ID for default eUICC
getCardIdForDefaultEuicc() returns the cardId of the default eUICC.

Bug: 80097562
Test: manual, UiccControllerTest
Change-Id: Iee001ce354184dff4862a92b6bda261797c19e56
2018-12-11 13:35:08 -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
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