Commit Graph

4472 Commits

Author SHA1 Message Date
Youming Ye
c8dad0200a Merge "Propagation of additional Ims Call Fail Causes" am: 97ee6295e9
am: 9834928c12

Change-Id: Ie3d7b237e3d7cfe2c53498807ff18bdbbfae61e9
2018-12-13 16:24:50 -08:00
Youming Ye
97ee6295e9 Merge "Propagation of additional Ims Call Fail Causes" 2018-12-13 23:47:49 +00:00
Sahin Caliskan
02278c9c53 Merge "Move RCS APIs to android.telephony.ims" am: 4929a0d782
am: 7c7dc29e8d

Change-Id: I2301681cd38c2d364c9e3a5bf94adb400065418c
2018-12-13 15:29:00 -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
Sahin Caliskan
4929a0d782 Merge "Move RCS APIs to android.telephony.ims" 2018-12-13 20:48:34 +00:00
Sahin Caliskan
7719db2b16 Move RCS APIs to android.telephony.ims
This is due to being compatible with other RCS related changes by by other engineers.
Test: Existing tests pass

Bug: 109759350
Change-Id: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
Merged-In: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
2018-12-13 16:50:28 +00:00
Youming Ye
da9de2d7fa Merge "Fix property setting with failure" 2018-12-13 06:55:25 +00: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
Jesse Fuentes
b9c35c1c0c Propagation of additional Ims Call Fail Causes
-Added new ImsReasonInfo error codes
-Add the new error codes in system-current.txt

Test:Manual
Bug:115925183

Change-Id: Id10651d08de2b77f0562e3c8733be76032a9611e
2018-12-12 17:49:50 -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
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
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
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
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
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
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
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
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
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
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
Hall Liu
85d5a309ca Merge "Fix validation problem in PhoneNumberRange" 2018-12-06 21:05:57 +00:00
Wileen Chiu
67bbcea7cf Fix property setting with failure
1, Avoid containing split char ',' in original value.
2, Check value utf-8 length to avoid exceeding the maximum length in
native layer.

Bug: 118357532
Change-Id: Ic2f17c474f5fcf6a513641c0f8f7edd0794decb0
2018-12-05 17:14:09 -08: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
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
chen xu
a2618627f0 support per carrier based iso country code.
1. apply carrierid-to-countrycode as an override table on
top of mcc-to-countrycode table which is coarse and inaccurate
especailly for dual ISMI SIM
2. persist country iso to simInfo db and notify change through
public API onSubscriptionChangedListener

Bug: 64775297
Bug: 110559381
Test: Build
Change-Id: I3ec2d90d9ce8dfba1418358de62eb4d099234757
2018-12-04 18:01:46 -08:00
Hall Liu
138455f161 Add AIDL for number verification request API
Add the new method to ITelephony and call it in the
requestNumberVerification API.

Bug: 119675160
Test: GTS later + testapps
Change-Id: I89baba023cdae746bc4afd96432f8348114d47cf
2018-12-04 17:10:55 -08:00
Sooraj Sasindran
a3ab858fda UpdateAvailableNetworks apis
Provide API to inform available networks

Bug: 117982838
Test: make and unit test
Merged-In: I9de1f767560551914de80031c1675d7e03b09775
Change-Id: I9de1f767560551914de80031c1675d7e03b09775
2018-12-04 23:56:04 +00:00
Hall Liu
78128395e7 resolve merge conflicts of 57a6375a99 to pi-dev-plus-aosp
Bug: 119675160
Test: None
Change-Id: Ib01e4549beca4fc237b7ea95aa9043536e1e1139
2018-12-04 18:55:18 +00:00
Hall Liu
239b0de673 Merge "Add API scaffolding for number verification" 2018-12-04 17:58:28 +00:00
Chen Xu
820f57b158 Merge "update comments for resetRadioConfig and rebootRadio" am: 72378c7f11
am: d359564449

Change-Id: Ic9f18acc9edb337f6316f43acab2e37d59fe7c1c
2018-12-03 15:29:58 -08:00
Chen Xu
72378c7f11 Merge "update comments for resetRadioConfig and rebootRadio" 2018-12-03 22:58:57 +00:00