Commit Graph

4766 Commits

Author SHA1 Message Date
Hall Liu
497fe21a71 Merge "Make MBMS group call API changes" am: 50cc796c28 am: 000e80e747
am: b8ac0d31a9

Change-Id: I3635e7ced8397d225096016d00046755117a1337
2018-11-26 18:49:16 -08:00
Hall Liu
b8ac0d31a9 Merge "Make MBMS group call API changes" am: 50cc796c28
am: 000e80e747

Change-Id: Ia9f198cb0b66cc7690ba9ff11f677b27714dd31d
2018-11-26 18:12:59 -08:00
Xiangyu/Malcolm Chen
6395b33290 Merge "Clear calling identity in callback." am: 0b4026b345
am: b7bebbc3fc

Change-Id: I92a2392d8d017759da671e25d98ebcf475c4a877
2018-11-26 17:35:11 -08:00
Xiangyu/Malcolm Chen
f1a39cde78 Merge "Remove parentSubId and define API to set groupSubId" am: d413b5c713
am: e1015e70c4

Change-Id: I4ed0c97ac3961da37397ba1bd0ea24535a6764b8
2018-11-26 17:27:21 -08:00
Hall Liu
50cc796c28 Merge "Make MBMS group call API changes" 2018-11-27 01:06:55 +00:00
Xiangyu/Malcolm Chen
0b4026b345 Merge "Clear calling identity in callback." 2018-11-27 00:24:14 +00:00
Hall Liu
c81cba4e2b Make MBMS group call API changes
Change the API to respond to API council comments
See bug for details

Bug: 117145859
Test: CTS
Change-Id: I4342e6e95da57fbcd550c571357ff7bc1923b70a
2018-11-26 14:37:56 -08:00
Malcolm Chen
aea9b02a22 Remove parentSubId and define API to set groupSubId
Bug: 118349116
Test: unittest
Change-Id: I539a67df8f30c2f58d87a3417f78fef8b43ff56d
Merged-In: I539a67df8f30c2f58d87a3417f78fef8b43ff56d
2018-11-26 14:13:10 -08:00
Youming Ye
8b84998fff Merge "Add CarrierConfig to hide Preset APN setting details" am: 4d73d87d83 am: e7e0dcdabe
am: 038ee2644b

Change-Id: I7c848ce780f65e5f354db0221456b2d01199ab6b
2018-11-26 14:08:29 -08:00
Malcolm Chen
b2129eb6b1 Clear calling identity in callback.
In SubscriptionManager, when onSubscriptionsChanged is called
when opportunistic subscriptions change, clear calling identity.
Otherwise mExecutor is executed with phone process identity
which can be a security issue.

Test: build
Bug: 117794788
Change-Id: I766cdc89f0421265cab00dc40d53f355deb7b92b
Merged-In: I766cdc89f0421265cab00dc40d53f355deb7b92b
2018-11-26 14:06:49 -08:00
Youming Ye
038ee2644b Merge "Add CarrierConfig to hide Preset APN setting details" am: 4d73d87d83
am: e7e0dcdabe

Change-Id: I8952ee0f6287f7a64075a2d633b8adf29d857f01
2018-11-26 13:51:16 -08:00
Youming Ye
4d73d87d83 Merge "Add CarrierConfig to hide Preset APN setting details" 2018-11-26 21:14:14 +00:00
Chen Xu
f54b45c68b Merge "integrate carrier id to carrier config" am: cc37384e58
am: 9a93149dab

Change-Id: If10abd107b6cf8f07819993fdcbee58328034ab3
2018-11-21 21:32:11 -08:00
Chen Xu
cc37384e58 Merge "integrate carrier id to carrier config" 2018-11-22 05:06:55 +00:00
chen xu
d95965ae1b integrate carrier id to carrier config
add carrierId and preciseCarrierId in CarrierIdentifier
which will be passed to carrier service to decide which carrier
info to look up

Bug: 110559381
Change-Id: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
Merged-in: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
2018-11-21 17:29:43 -08:00
Chen Xu
ecfc941500 Merge "integrate carrier id to carrier config" 2018-11-22 01:22:23 +00:00
taiki tsutsumi
2ee968289e Add CarrierConfig to hide Preset APN setting details
Add new key to hide Preset APN setting details. When the key is set to
true, Preset APN is still shown and selectable in APN list, however,
user cannot enter APN editor view. It means details of Preset APN will
be hidden from user.

Test: manual - check Preset APN setting details are hidden
Bug: 115453290
Change-Id: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b
2018-11-21 15:41:49 -08:00
Brad Ebinger
a5019f8d8a Merge "Expose ImsMmTelManager APIs as SystemApi" am: 8a3518cc90 am: 674804fcff
am: c61177a53e

Change-Id: I5c3a1d8ece83eb9dd7eae4151b77f0d70b6b7b6a
2018-11-21 11:46:25 -08:00
Brad Ebinger
c61177a53e Merge "Expose ImsMmTelManager APIs as SystemApi" am: 8a3518cc90
am: 674804fcff

Change-Id: Ib2d83d265a977834bf6ed2fc843be61d9d6993a4
2018-11-21 11:21:58 -08:00
chen xu
ed7a2e1e41 integrate carrier id to carrier config
add carrierId and preciseCarrierId in CarrierIdentifier
which will be passed to carrier service to decide which carrier
info to look up

Bug: 110559381
Change-Id: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
2018-11-21 11:09:40 -08:00
Brad Ebinger
8a3518cc90 Merge "Expose ImsMmTelManager APIs as SystemApi" 2018-11-21 18:59:33 +00:00
Brad Ebinger
fd88080d22 Expose ImsMmTelManager APIs as SystemApi
Bug: 116493310
Bug: 112538960
Bug: 112866475
Test: Telephony unit tests
Change-Id: I698d9ab6000dc2e2e9be8d614e94d59b3a8e3028
2018-11-20 13:59:37 -08:00
Tony Zhu
705a4390ec Merge "[API Review]Clarify method that obtain a component name" am: c128fa0f93 am: 7655d9dd0f
am: ed8581bf13

Change-Id: I8c3007d800d80cc3bcdf83619c769801255ba54d
2018-11-19 19:06:28 -08:00
Tony Zhu
ed8581bf13 Merge "[API Review]Clarify method that obtain a component name" am: c128fa0f93
am: 7655d9dd0f

Change-Id: Ib8b3215dfeddcf7ff2891f04ebf6bbbc27d8fc10
2018-11-19 18:57:35 -08:00
Tony Zhu
c128fa0f93 Merge "[API Review]Clarify method that obtain a component name" 2018-11-20 02:36:32 +00:00
Chen Xu
7cf6b04641 Merge "Telephony light grey list clean up for Q" am: 71ca860ff7 am: 0daf5ca480
am: f4626014ea

Change-Id: I35da50b43ebef204d56c7e9e28173aba32f50f94
2018-11-19 18:28:24 -08:00
Chen Xu
f4626014ea Merge "Telephony light grey list clean up for Q" am: 71ca860ff7
am: 0daf5ca480

Change-Id: I5c18a432f3cf04f7071334e69c3726bc6775ee51
2018-11-19 18:19:00 -08:00
Chen Xu
71ca860ff7 Merge "Telephony light grey list clean up for Q" 2018-11-20 01:56:19 +00:00
Shuo Qian
75418ebfe2 Merge "Remove dummy subscription ids" am: 22d12411fd
am: f7a5ef5caa

Change-Id: Id0a69db7c6668770361b6df58eef8d1a082ceca4
2018-11-19 14:24:52 -08:00
sqian
91412858b7 Remove dummy subscription ids
Test: Treehugger
Bug: 119144366
Change-Id: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e
Merged-In: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e
(cherry picked from commit bfde48f4ed)
2018-11-19 12:54:44 -08:00
Shuo Qian
2f6ef53ec6 Merge "Remove dummy subscription ids" 2018-11-19 20:38:42 +00:00
TreeHugger Robot
5798ef6a96 Merge "public eSIM APIs created in Android P" 2018-11-19 18:26:23 +00:00
tonyzhu
6ac54dc519 [API Review]Clarify method that obtain a component name
Change JavaDoc in CarrierConfigManager.java. Clarify what format
string will be set and get from the key. Using ComponentName methods
to convert.

Bug: 118675660
Test: build success.
Change-Id: I47db5b665808ef7dbc9081e0112a04958497d6fd
2018-11-20 02:04:27 +08:00
TreeHugger Robot
271339ffdf Merge "API: Make implicit APIs from type usage explicit" 2018-11-19 17:21:27 +00:00
SongFerng Wang
bf44aa1371 Merge "Add 3 carrier cofigs for Supplementary Service over USSD project" 2018-11-19 06:11:55 +00:00
chen xu
f4c5c6ee96 Telephony light grey list clean up for Q
Bug: 112477300
Test: Telehony unit test
Change-Id: I9485abba093a96c91816d77c7273e1a38cb5182a
2018-11-18 18:56:00 -08:00
TreeHugger Robot
ba1c017456 Merge "Support set/get carrier id from ApnSetting" 2018-11-19 02:35:28 +00:00
John Reck
18fd5c6362 Fix telephony build
Test: make

Change-Id: I9db9ab609a924f786bb7031e6def86cbe2ac4c81
2018-11-16 23:54:49 +00:00
Nathan Harold
6ef595468c Merge "Add Support for Async requestCellInfoUpdate()" am: 992aafb2bd am: f3d183108b
am: 247f4e292f

Change-Id: Ic65f1d1c929b22371e827d63281a3447ca29e8bc
2018-11-16 14:07:13 -08:00
Nathan Harold
949be76dfc Merge "Remove CDMA doc in setPreferredNetworkType()" am: 8aeeea135a am: 89470414f2
am: 9075818aac

Change-Id: I7c483985257ee647c7d741e3e0c17efe390bd267
2018-11-16 13:59:42 -08:00
Nathan Harold
757048b72f Merge "Redirect Value Source of SignalStrength Constants" am: d1db62d59e am: a7381e9af0
am: 6a759eb646

Change-Id: I6a222e0371e973f0f98419e15e6c4b38aff7409c
2018-11-16 13:53:32 -08:00
Pengquan Meng
514277f4cd Merge "Add 5G NSA status to ServiceSate" am: c49ec8d1e7
am: c7b58deca1

Change-Id: Ic92ed92c9505b3eb20d7f41a20362829b4ab6192
2018-11-16 13:10:08 -08:00
Nathan Harold
247f4e292f Merge "Add Support for Async requestCellInfoUpdate()" am: 992aafb2bd
am: f3d183108b

Change-Id: Iee76a8ee4cd04cf5847ab33320635f7dab29d9e2
2018-11-16 12:58:31 -08:00
Nathan Harold
9075818aac Merge "Remove CDMA doc in setPreferredNetworkType()" am: 8aeeea135a
am: 89470414f2

Change-Id: I085a2a02eecf2b28ccb63d393f9e909713bd4e65
2018-11-16 12:52:43 -08:00
Nathan Harold
6a759eb646 Merge "Redirect Value Source of SignalStrength Constants" am: d1db62d59e
am: a7381e9af0

Change-Id: I2b909a24dc2bfe49379a6899c3f7c29cb1d20f78
2018-11-16 12:47:54 -08:00
Pengquan Meng
c49ec8d1e7 Merge "Add 5G NSA status to ServiceSate" 2018-11-16 20:40:12 +00:00
Nathan Harold
992aafb2bd Merge "Add Support for Async requestCellInfoUpdate()" 2018-11-16 19:13:36 +00:00
Nathan Harold
8aeeea135a Merge "Remove CDMA doc in setPreferredNetworkType()" 2018-11-16 19:13:15 +00:00
Nathan Harold
d1db62d59e Merge "Redirect Value Source of SignalStrength Constants" 2018-11-16 19:12:58 +00:00
Pengquan Meng
6aa5213eee Add 5G NSA status to ServiceSate
This added the 5G FrequencyRange to the ServiceState and 5G connection
status to NetworkRegisterationState.

Bug: 111453000
Test: atest FrameworksTelephonyTests
Merged-In: Iee824b2cfd9b48b56d6541b6eef617d23677a873
Change-Id: Iee824b2cfd9b48b56d6541b6eef617d23677a873
2018-11-16 10:47:00 -08:00