SongFerng Wang
341b8c38da
Merge "isTetherApnRequired api rename as isTetheringApnRequired" am: 25ea00d059 am: c4bb6df605
...
am: 1877b8226d
Change-Id: Ie5aa119857b940abb838f5cb0baf6ba294eb896a
2019-11-20 02:24:15 -08:00
SongFerng Wang
c4bb6df605
Merge "isTetherApnRequired api rename as isTetheringApnRequired"
...
am: 25ea00d059
Change-Id: Id6e9d123f2dfb627402f09e0a609413f7b487af1
2019-11-20 02:11:20 -08:00
SongFerng Wang
25ea00d059
Merge "isTetherApnRequired api rename as isTetheringApnRequired"
2019-11-20 08:46:05 +00:00
Tyler Gunn
5474568b87
Merge "Add prioritized enableCarMode API in UiModeManager"
...
am: 8e7a1f8528
Change-Id: I81d8b4a457c567e19c3c8e499cc1f08e1c8af3b3
2019-11-20 00:17:34 -08:00
Tyler Gunn
8e7a1f8528
Merge "Add prioritized enableCarMode API in UiModeManager"
2019-11-20 07:08:19 +00:00
Zoey Chen
7d4cb3c5d3
Merge "[Telephony mainline] Add SystemApi and NonNull annotation"
2019-11-20 04:23:26 +00:00
Charles Munger
1b6300cdf2
Merge "Deprecate implicit Handler constructors" am: 560c3ebe1e am: 080ddd5dfd
...
am: 952dd95b46
Change-Id: Ia2de7c065ec5b8941087cd5c02eb9589f72c27b8
2019-11-19 19:56:42 -08:00
Brad Ebinger
15bc4c6a0c
Merge "Add support for disconnecting outgoing calls for emergency calls" am: 252fcc7b27 am: 5dc01f163a
...
am: dd1cd69743
Change-Id: I588f15fd76f6bb1b863c612aa8f896be098317f4
2019-11-19 19:55:15 -08:00
Charles Munger
5c76aaae1b
Merge "Deprecate account-specific activity subclass" am: b7c5d354fb am: 310697d68d
...
am: 3dd92afd74
Change-Id: Ia3cf674a7bca083fbdcc76e3d274cb5c2275cc8a
2019-11-19 19:45:09 -08:00
Chen Xu
c4944f81b2
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL" am: 04b9b718a5 am: 550006b8f8
...
am: 6f16f33d4c
Change-Id: I8768a687343265b4634919370affdffa49eb46b2
2019-11-19 19:32:22 -08:00
Rahul Sabnis
d3d41774f9
Merge "Create systemapis to connect/disconnect all bt profiles" am: 7700b81cb3 am: 3e4a53735e
...
am: 0f6700acb5
Change-Id: I9b4a4b7ca4967bab1a6b3170941e2bb2fa79564d
2019-11-19 18:09:39 -08:00
Hall Liu
f47ee8f193
Merge commit 'ae63546d19f91931a9a05015b149ddc19091c895' into manual_merge_ae63546d19f91931a9a05015b149ddc19091c895
...
Change-Id: Ic7b8ec208eaed5fc3a9f5ee90dac5ffeb9a18543
2019-11-19 17:25:46 -08:00
Charles Munger
080ddd5dfd
Merge "Deprecate implicit Handler constructors"
...
am: 560c3ebe1e
Change-Id: I254f85c07743883c7d350a47750dad0745c47d52
2019-11-19 16:04:15 -08:00
Brad Ebinger
5dc01f163a
Merge "Add support for disconnecting outgoing calls for emergency calls"
...
am: 252fcc7b27
Change-Id: I0f3d0a651b69e76de0ba3f3a473bd5bcbb4c4d35
2019-11-19 15:39:32 -08:00
Jordan Liu
2ca04cf384
Merge "Expose Geometry, LatLng, and maxWaitDuration"
...
am: e993fb8bb9
Change-Id: Ie8332c4a2b6ee5617b4313235932645cbb4f593d
2019-11-19 15:35:35 -08:00
Brad Ebinger
f6b214da1c
Merge "Reorder getFeatureState parameters to convention"
...
am: e11ab258b9
Change-Id: I9b0671d59bb7503d0947d354a5e5030b20010cdb
2019-11-19 15:31:34 -08:00
Charles Munger
310697d68d
Merge "Deprecate account-specific activity subclass"
...
am: b7c5d354fb
Change-Id: Ie21ab07bfe7f857c642e62b11e33085db199a021
2019-11-19 15:29:12 -08:00
Treehugger Robot
560c3ebe1e
Merge "Deprecate implicit Handler constructors"
2019-11-19 23:28:12 +00:00
Chen Xu
550006b8f8
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"
...
am: 04b9b718a5
Change-Id: I53213519b7702400713c9446e9b36a24f4e1fddf
2019-11-19 15:18:12 -08:00
Rahul Sabnis
3e4a53735e
Merge "Create systemapis to connect/disconnect all bt profiles"
...
am: 7700b81cb3
Change-Id: I3780cb82ad20d84ea3d8d87b85dd6d37d1e8f907
2019-11-19 15:16:53 -08:00
Tyler Gunn
18325cf2d4
Merge "Add prioritized enableCarMode API in UiModeManager"
2019-11-19 23:16:33 +00:00
Tyler Gunn
f05f2c2cc2
Add prioritized enableCarMode API in UiModeManager
...
Per design doc (go/android-car-mode-design), added new system API to
enable car mode and specify a priority for the calling app.
Also modified UiModeManager to pass the package name of the caller to
UiModeManagerService.
Bug: 136109592
Test: Added new unit tests and CTS tests.
Test: Added Telecom test app functionality to verify.
Change-Id: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
Merged-In: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
2019-11-19 23:15:52 +00:00
Treehugger Robot
252fcc7b27
Merge "Add support for disconnecting outgoing calls for emergency calls"
2019-11-19 22:44:18 +00:00
Tom Taylor
081777becd
Merge "Add sms receiver result codes"
2019-11-19 21:40:03 +00:00
Jordan Liu
e993fb8bb9
Merge "Expose Geometry, LatLng, and maxWaitDuration"
2019-11-19 20:55:36 +00:00
Hall Liu
dab3711435
Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
...
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
Brad Ebinger
e11ab258b9
Merge "Reorder getFeatureState parameters to convention"
2019-11-19 19:10:05 +00:00
TreeHugger Robot
6b8f486bd5
Merge "Extract SparseArrayMap from QuotaController."
2019-11-19 18:31:06 +00:00
Charles Munger
b7c5d354fb
Merge "Deprecate account-specific activity subclass"
2019-11-19 16:42:55 +00:00
Mohammad Samiul Islam
7da3588356
Merge "Allow staging multiple session with non-overlapping packages (apk-only)"
2019-11-19 12:03:51 +00:00
Brad Ebinger
6271387650
Add support for disconnecting outgoing calls for emergency calls
...
1) Add CarrierConfig to allow/disallow holding calls for emergency
calls.
2) If holding an ongoing call for an emergency call is disallowed,
define a new DisconnectCause reason to notify telecom/dialer of this
disconnect reason.
Bug: 138741228
Test: atest CtsTelecomTestCases; atest CtsTelephonyTestCases
Change-Id: I7c6a1d0f648c598111ed047fbb9c609843c6aba9
2019-11-18 18:57:54 -08:00
Kweku Adams
a26ae90b4d
Extract SparseArrayMap from QuotaController.
...
This structure can be useful in other parts of the system, so extracting
it and making it more generic makes sense.
Bug: 135764360
Bug: 141645789
Test: atest QuotaControllerTest
Test: atest SparseArrayMapTest
Change-Id: I2aeb3ea53e3dc2ec00667a0a2ccdb112cf562377
2019-11-18 17:58:00 -08:00
Chen Xu
04b9b718a5
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"
2019-11-19 01:32:30 +00:00
Rahul Sabnis
7700b81cb3
Merge "Create systemapis to connect/disconnect all bt profiles"
2019-11-18 23:15:06 +00:00
Hall Liu
1d7a53da98
Merge changes from topic "mainline4"
...
* changes:
Add new API for Telecom to send phone state
Minor style correction to avoid merge conflict
non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00:00
Charles Munger
47ad15428a
Merge "Mark strings with incorrect contents as deprecated" am: 3a4addba4b am: 04af2e4f80
...
am: 44c9f535e1
Change-Id: I76160b258170ae42fb340a4d30e1f35d6d8b8b45
2019-11-18 14:13:23 -08:00
Charles Munger
04af2e4f80
Merge "Mark strings with incorrect contents as deprecated"
...
am: 3a4addba4b
Change-Id: I76da2baee8fb1d3e26ba60d39b40f567ada04339
2019-11-18 13:56:20 -08:00
Charles Munger
3a4addba4b
Merge "Mark strings with incorrect contents as deprecated"
2019-11-18 21:31:52 +00:00
Tyler Gunn
daef668a99
Add prioritized enableCarMode API in UiModeManager
...
Per design doc (go/android-car-mode-design), added new system API to
enable car mode and specify a priority for the calling app.
Also modified UiModeManager to pass the package name of the caller to
UiModeManagerService.
Bug: 136109592
Test: Added new unit tests and CTS tests.
Test: Added Telecom test app functionality to verify.
Change-Id: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
2019-11-18 13:03:30 -08:00
Charles Munger
67127ff179
Deprecate account-specific activity subclass
...
Bug: 144042891
Test: No behavior changes
Change-Id: I22cc3f2d19280adeb627c5d9797621fac8b2da1d
2019-11-18 12:53:43 -08:00
Chen Xu
42d7faea52
Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent"
...
am: 3c397a6217
Change-Id: I87928d3760e884b7b0348f7bbedfdde4c5e8d623
2019-11-18 11:16:54 -08:00
Chen Xu
2d98a66b18
Merge "add a new telephony protection level"
...
am: cd953e939f
Change-Id: Ie275baf92a865fe1dc5855b00e49944d2598e4b4
2019-11-18 11:16:00 -08:00
Chen Xu
3c397a6217
Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent"
2019-11-18 19:04:39 +00:00
David Su
f7ef955d90
WifiManager/Scanner: Expose @hide APIs as @SystemApi
...
Expose @hide APIs in WifiManager/WifiScanner as
@SystemApi so that they can be referenced by external
callers (mostly Settings).
Bug: 143970861
Test: atest FrameworksWifiApiTests
Change-Id: I956290e2a3aca3f4946da52d7e271082824dd06c
2019-11-18 10:44:56 -08:00
David Su
9b2c03ecdf
Merge "Expose Wifi P2P @hide APIs as @SystemApi"
2019-11-18 17:52:54 +00:00
Kenny Guy
e9eb313f14
Merge "Add an API to BrightnessConfiguration to enable colour sampling."
2019-11-18 16:50:34 +00:00
Charles Munger
82f67657f2
Mark strings with incorrect contents as deprecated
...
Bug: 36908899
Test: No behavior changes
Change-Id: I963b75e81b1d09afa98f732a79bd3e695855451c
2019-11-18 16:21:11 +00:00
zoey chen
fa86d5a012
[Telephony mainline] Add SystemApi and NonNull annotation
...
Bug: 143860012
Test: make
Change-Id: I619d6ba04cb28830e3995feb02ffcb592ff65818
2019-11-18 15:56:21 +08:00
Goven Liu
b75323eb34
Merge "[Wi-Fi] Add intent action & extra keys & result codes for add networks."
2019-11-18 04:33:17 +00:00
Chen Xu
da02e07b92
add a new telephony protection level
...
for oems which take telephony mainline module, all telephony related
apks will be signed with non-platform certificate. that said apks won't
be able to grant platform signature permission. Solution is to add a new
telephony protection level.
Bug: 141479803
Test: cts & manual
Change-Id: Ib3be016080d42fd76e7c131f4e44d815ce431e6e
(cherry picked from commit 45c183d201 )
Merged-in: Ib3be016080d42fd76e7c131f4e44d815ce431e6e
2019-11-17 17:49:41 -08:00