Commit Graph

3258 Commits

Author SHA1 Message Date
Jiuyu Sun
be06b5fc0e Merge "Add hashCode() in UiccAccessRule." 2018-02-26 05:48:14 +00:00
TreeHugger Robot
3a3bb15763 Merge "Added CTS test cases for getNetworkId() and getSystemId()" 2018-02-24 00:37:08 +00:00
Gil O'Neil
183a553273 Merge "Allow certificates to be stored in the carrier app whitelist" 2018-02-23 21:18:40 +00:00
Jack Yu
44612f4aa9 Merge "Fixed service state CTS test failing" am: ab5bc3be50 am: f535f8108d
am: 09da9870d0

Change-Id: Iac059a0df9bf6c3920327101d4423ef9acc60ebb
2018-02-23 17:46:03 +00:00
Jack Yu
09da9870d0 Merge "Fixed service state CTS test failing" am: ab5bc3be50
am: f535f8108d

Change-Id: Ia3e1e58acda7aa3099c93f1f6c2bef9f53828e4d
2018-02-23 17:27:20 +00:00
Treehugger Robot
ab5bc3be50 Merge "Fixed service state CTS test failing" 2018-02-23 15:41:32 +00:00
Cassie
b5d3d67077 Merge "Add comments according to the API review process." am: e9a215b238 am: b3b458b9ad
am: b1b06cbaf5

Change-Id: Ic90fe7f73ae2442e5bd3c8e7f69e70c1b5332ff6
2018-02-23 07:07:18 +00:00
Cassie
b1b06cbaf5 Merge "Add comments according to the API review process." am: e9a215b238
am: b3b458b9ad

Change-Id: Ie9c3ce9bc67c08d99ea1c1ebfce5fbc78575baea
2018-02-23 06:56:56 +00:00
Treehugger Robot
e9a215b238 Merge "Add comments according to the API review process." 2018-02-23 05:32:35 +00:00
Jack Yu
1b8b38928b Added CTS test cases for getNetworkId() and getSystemId()
Bug: 32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
2018-02-22 17:37:38 -08:00
goneil
6db18a9bad Allow certificates to be stored in the carrier app whitelist
Use CARRIER_APP_WHITELIST to store app certificate mapped to package
name (instead of just package name as we had before).

Bug: 70042722
Test: SettingsBackupTest
Test: UiccProfileTest#testParseWhitelistMapFromString() for parsing map
Change-Id: Ia0c7c364cd8154272ef62cbbf412036b4eae1b21
2018-02-22 16:39:01 -08:00
Holly Jiuyu Sun
eafc952dbe Add hashCode() in UiccAccessRule.
hashCode() and equals() should appear together.

Bug: 73785903
Test: test on phone
Change-Id: I7f9d8943f6a0e1039815e21ff6dfe035bd674639
2018-02-22 15:47:27 -08:00
Jack Yu
7d20eae135 Fixed service state CTS test failing
Added missing member variables in copyFrom().

Bug: 73298491
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState CtsTelephonyTestCases:TelephonyManagerTest#testGetServiceState
Change-Id: I750816a13801a911d68e0a774fd59602c81c5687
2018-02-22 14:35:43 -08:00
Cassie
e1c880242b Add comments according to the API review process.
* Explain what developers should use instead in the @deprecated note for Telephony#BEARER
 * Please add more documentation for network type bitmask - reference to just TelephonyManager is not sufficient because it has so much stuff in it.
 * Also remove the @hide tag for private constants in ServiceState.

Bug: 73751228
Test: Basic telephony sanity
Change-Id: Ie7405a961db4494104750bf406f20b1b4fb8191a
2018-02-22 09:08:48 -08:00
Pengquan Meng
62747fee15 Merge "Cleanup TelephonyManager's log" am: 033de4676b am: 22f61111bd
am: bfb00f97af

Change-Id: Iccc3d497bf28906f4da54eef3acbd72dc04bfd3c
2018-02-22 15:53:27 +00:00
Hall Liu
a433bdc9e8 Merge "EMBMS API tweaks" am: 47e1d11b47 am: 3b40c709a3
am: 2a08ccdd8b

Change-Id: I617e2bca44d52b55f2d032db0fe59aa0a9f88e24
2018-02-22 15:38:26 +00:00
Pengquan Meng
bfb00f97af Merge "Cleanup TelephonyManager's log" am: 033de4676b
am: 22f61111bd

Change-Id: Icaff0e2cc4ebeb1f36b8597ee11457779aeca06f
2018-02-22 07:14:43 +00:00
Pengquan Meng
033de4676b Merge "Cleanup TelephonyManager's log" 2018-02-22 05:19:11 +00:00
Hall Liu
2a08ccdd8b Merge "EMBMS API tweaks" am: 47e1d11b47
am: 3b40c709a3

Change-Id: I8b281f717d3862a9f7a5de3d834dcded4ac436dc
2018-02-22 03:54:18 +00:00
Hall Liu
017afff112 Merge "Check for location access on TelephonyRegistry" am: 31230bb193 am: f581580fdb
am: 9b31dd86da

Change-Id: Icd2feab82a9350fa2b6539617863ad91a44e5208
2018-02-22 00:43:12 +00:00
Hall Liu
47e1d11b47 Merge "EMBMS API tweaks" 2018-02-22 00:35:51 +00:00
Hall Liu
9b31dd86da Merge "Check for location access on TelephonyRegistry" am: 31230bb193
am: f581580fdb

Change-Id: Ic13eacf7dafc96359bd607cb4e2a5c024f9bb607
2018-02-22 00:34:03 +00:00
Hall Liu
31230bb193 Merge "Check for location access on TelephonyRegistry" 2018-02-21 22:42:08 +00:00
Pengquan Meng
dd056c9b8e Cleanup TelephonyManager's log
Don't log success calls to TelephonyManager.setTelephonyProperty.

Bug: 71514398
Test: manual test
Change-Id: I2383f1e2925bff959c3d925d7fdc8be891630c61
2018-02-20 19:09:14 -08:00
Hall Liu
5b844876ba EMBMS API tweaks
Make changes per API council recommendations
Also clean up the download flow -- provide option for app to specify a
destination as long as it's on the same filesystem.

Bug: 72837388
Fixes: 72231372
Test: CTS and testapp

Change-Id: Ia2a68a73e6d61f426b55068542a66995afc20407
2018-02-20 17:08:47 -08:00
Brad Ebinger
f48a40d1e2 Merge "Add new reason code for call failed by unobtainable number" am: 4122fd23dc am: ffe0e51f47
am: e73631c161

Change-Id: I0b72033ace19075e4acd8f7a9eaec3770bb07836
2018-02-20 23:44:12 +00:00
Pankaj Kanwar
b23e1716c5 Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false" am: 8343a47035 am: de9585fe28
am: 44b27e486a

Change-Id: I2849ed28eaff8666364dbb9848b4a08c952f5d17
2018-02-20 23:29:10 +00:00
Brad Ebinger
e73631c161 Merge "Add new reason code for call failed by unobtainable number" am: 4122fd23dc
am: ffe0e51f47

Change-Id: I9b706c18b2d184b303adb526ee7adf86dd7e9ee9
2018-02-20 23:20:48 +00:00
Pankaj Kanwar
44b27e486a Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false" am: 8343a47035
am: de9585fe28

Change-Id: I11bcc2948e8efeea731299c5b8d642e155c1a2d5
2018-02-20 23:13:33 +00:00
Brad Ebinger
4122fd23dc Merge "Add new reason code for call failed by unobtainable number" 2018-02-20 21:00:08 +00:00
pkanwar
84a8bb80a1 Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false
Bug: 73609752
Test: compile

Change-Id: Ie9615e63d136f40ee301504b3e2b3b7ea4aec129
2018-02-19 10:35:57 -08:00
haoyu li
f492faf405 Add new reason code for call failed by unobtainable number
To show the "Invalid number" on the end call screen when user makes a
IMS call with unobtainable number, this reason code is used.

Test: manual - Checked that "Invalid number" is shown when make the IMS
MO call to unobtainable number.
Bug: 69940434

Change-Id: If3c54e6f55850141efad56ad7712db3c82a14f43
2018-02-19 08:33:55 +00:00
Brad Ebinger
b8d25ed3a4 Merge "MSIM support for hidden IMS capability and registration query APIs." 2018-02-16 20:35:45 +00:00
Nathan Harold
1bc6a761e5 Merge "Fix LTE Timing Advance Doc String" am: 3df127aefe am: c52bec3acb
am: 22a4780b5f

Change-Id: I1a32863add6f7b12f9ee6b3fea7895b53ffe61a2
2018-02-16 03:37:09 +00:00
Nathan Harold
22a4780b5f Merge "Fix LTE Timing Advance Doc String" am: 3df127aefe
am: c52bec3acb

Change-Id: I352f5d1e72b48d7a4944b0f0935fe03d4c5979c1
2018-02-16 03:19:43 +00:00
Xiangyu/Malcolm Chen
4171a8c186 Merge "Add NetworkRegistrationState into SS's list." am: 9f92ed943c am: 6576ed3d5b
am: 58bb4ccd4b

Change-Id: I1c7a6e8675f237d68d027cd1304e4a7c4b901556
2018-02-16 00:12:00 +00:00
TreeHugger Robot
7c24845ab3 Merge "MSIM support for hidden IMS capability and registration query APIs." into oc-mr1-dev-plus-aosp 2018-02-16 00:10:35 +00:00
Xiangyu/Malcolm Chen
58bb4ccd4b Merge "Add NetworkRegistrationState into SS's list." am: 9f92ed943c
am: 6576ed3d5b

Change-Id: I02efc2c7dceb775a5ce2eb3e3f2696e098cef046
2018-02-15 23:50:31 +00:00
Brad Ebinger
f6965c9c0f Merge "Add new owners files for Telephony/Telecom frameworks files." am: 1da6f542ef am: fee59fac7b
am: f7976437e7

Change-Id: I2911891f579358427d5535b26ae9759058773b42
2018-02-15 22:36:05 +00:00
Brad Ebinger
f7976437e7 Merge "Add new owners files for Telephony/Telecom frameworks files." am: 1da6f542ef
am: fee59fac7b

Change-Id: Ieb1f9465eaec47f51d3e62a15c7d4f6fd0970dd0
2018-02-15 21:46:48 +00:00
Nathan Harold
e227065214 Fix LTE Timing Advance Doc String
The Doc string for LTE timing advance incorrectly
lists the range based on the maximum size of an
incremental TA command rather than the cumulative
timing advance. The spec reference is correct, but
the range was wrong.

Bug: 66751464
Test: compilation (docstring only change)
Change-Id: I0242cae7af40a7d9ed5ae9a2a509592076e5b6a3
2018-02-15 13:07:59 -08:00
Xiangyu/Malcolm Chen
9f92ed943c Merge "Add NetworkRegistrationState into SS's list." 2018-02-15 19:01:59 +00:00
Brad Ebinger
f9a02975ea Merge "MSIM support for hidden IMS capability and registration query APIs." 2018-02-15 18:31:32 +00:00
Brad Ebinger
1da6f542ef Merge "Add new owners files for Telephony/Telecom frameworks files." 2018-02-15 17:23:31 +00:00
Tyler Gunn
6b067bc879 Add new owners files for Telephony/Telecom frameworks files.
Test: N/A
Bug: 73373651
Change-Id: Ia0e19018d6cd72923f9f20b372d303fa532409b0
2018-02-14 16:13:39 -08:00
Malcolm Chen
574b41a1bd Add NetworkRegistrationState into SS's list.
Add hidden API to add NetworkRegistrationState into SS's
NetworkRegistrationState list.

Bug: 73305596
Test: unittest
Change-Id: Ief7f22632c1f3400c01663d13b990dc9b0d59e2e
2018-02-14 14:32:29 -08:00
Chen Xu
ddf41d99f3 Merge "add a current table in CarrierIdProvider" am: 3fa6fe2117
am: 9fce67f50f

Change-Id: Ia8dbd47c1c4cf775f7597e7e93c8315bf004e9e0
2018-02-14 21:09:29 +00:00
Brad Ebinger
64afdd9376 MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.

Test: Manual, telephony unit tests.
Bug: 35128252
Merged-In: Ie37185bd3477635094a0db998918ba5ad59842be
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
2018-02-14 18:36:17 +00:00
Brad Ebinger
8c13414d07 MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.

Test: Manual, telephony unit tests.
Bug: 35128252
Merged-In: Ie37185bd3477635094a0db998918ba5ad59842be
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
2018-02-14 18:27:19 +00:00
Brad Ebinger
76e48f8a60 MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.

Test: Manual, telephony unit tests.
Bug: 35128252
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
2018-02-14 10:10:42 -08:00