Grace Jia
f5468331b4
Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself." am: 59c47d24fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526998
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64ff49bbb502052a4e19a654170ff953c378c664
2021-02-01 18:18:11 +00:00
Grace Jia
59c47d24fc
Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself."
2021-02-01 17:55:33 +00:00
Lorenzo Colitti
f681bee340
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I147a86d5252f29a88d3a0fdb5c27d4c101791e7c
2021-02-01 16:04:06 +00:00
Lorenzo Colitti
5a700b2725
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs""
2021-02-01 15:33:11 +00:00
Anton Hansson
389332a285
Merge changes If81cda01,I1df8b8e0 am: 3351717493
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26af56f725ad03555b7991f51cfbebbbbdd758d7
2021-02-01 14:54:47 +00:00
Grace Jia
4e8dc10871
Add relative APIs for InCallService that can support self-managed
...
connections that want to expose itself.
Add PhoneAccount#EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE and
Connection#onInCallServiceTrackingChanged.
Bug: 161144815
Test: CtsTelecomTestCases
Change-Id: I0a42ea79a1cd46aa9df3399c4fa2e9396321778a
Merged-In: I0a42ea79a1cd46aa9df3399c4fa2e9396321778a
2021-02-01 14:51:31 +00:00
Anton Hansson
285c6a2018
Limit build visibility of modules in apex/... am: 096a1756fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie104a8cce24b86fe6dbea57119ee2a9090edb7ce
2021-02-01 14:50:38 +00:00
Anton Hansson
3351717493
Merge changes If81cda01,I1df8b8e0
...
* changes:
Suppress [CallbackInterface] metalava rule for mainline modules.
Limit build visibility of modules in apex/...
2021-02-01 14:02:20 +00:00
Lorenzo Colitti
2425886baa
Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If12227f11585de18d92995cf603765b18f91764f
2021-02-01 11:36:03 +00:00
Lorenzo Colitti
d4caba4daf
Merge changes Idcc9e32c,I58769bb7
...
* changes:
Remove getFilteredNetworkState and add @NonNull in NetworkState.
Add test coverage for get*NetworkInfo on metered networks.
2021-02-01 10:56:19 +00:00
Nicolas Geoffray
b86c3a3470
Merge "Support for showing percent progress in boot animation." am: 87d840addd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64c03c5c85c216eb739e482eca267c1dadd3169b
2021-02-01 10:26:21 +00:00
Nicolas Geoffray
87d840addd
Merge "Support for showing percent progress in boot animation."
2021-02-01 09:51:30 +00:00
Lorenzo Colitti
0053756e78
Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"
...
This reverts commit c92a798ee8 .
Reason for revert: not necessary, since VCN already has access to system APIs
Bug: 174606949
Test: revert with no conflicts
Change-Id: Ife2d0fc08c540265d52cdf930d0b6df005990ac8
2021-02-01 08:13:32 +00:00
Lorenzo Colitti
d8cc12a87b
Remove getFilteredNetworkState and add @NonNull in NetworkState.
...
getFilteredNetworkState is only used in two places, both of which
use only small parts of the NetworkState that is returned to
them. Remove the method and replace it with inline code in the
two callers. NetworkState is a fairly expensive object, and this
removes the need to perform lots of defensive copies of data that
the caller does not need.
Also remove the only call to the NetworkState constructor in
ConnectivityService. That leaves only one caller to the
NetworkState constructor, the one in NetworkAgentInfo. This
constructor is called with defensive copies of NetworkInfo,
LinkProperties, and NetworkCapabilities, so mark these three
parameters as @NonNull. It's also called with a non-null
Network, because NetworkAgentInfo is only constructed with
non-null Networks, so mark the network parameter @NonNull as
well.
In order to make the arguments in the NetworkState constructor
@NonNull, introduce a new constructor that sets everything to
null and make NetworkState.EMPTY call it.
Test: atest FrameworksNetTests
Change-Id: Idcc9e32c53533b0cf61494517e62d4c184fa7610
2021-02-01 16:12:04 +09:00
Lorenzo Colitti
cfc5ab2f25
Add test coverage for get*NetworkInfo on metered networks.
...
Test: test-only change
Change-Id: I58769bb768978d0acff1da6d32c2f6942c43508b
2021-02-01 15:58:12 +09:00
Remi NGUYEN VAN
5acf0f78fb
Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42989abf6e81a4c0e7bed6b0890a1ee4f2c30191
2021-02-01 06:09:33 +00:00
Remi NGUYEN VAN
3d70ab73eb
Merge "Move module sources to packages/Connectivity"
2021-02-01 05:25:15 +00:00
Chalard Jean
356c6725c6
Merge "Start VcnManagementService after ConnectivityService" am: 1595b1aa38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539845
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I247c61247bb5d8a046e0a0cc3ac4605d0dd1d8df
2021-02-01 05:03:49 +00:00
Chalard Jean
1595b1aa38
Merge "Start VcnManagementService after ConnectivityService"
2021-02-01 04:38:08 +00:00
Calvin Pan
e532d3be62
Merge "Add TelephonyShellCommand to get EAB contact" am: d2d77dba7d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d2c0290c0aeb574c2cc5201e8012a79f0ab6e3e
2021-02-01 03:03:52 +00:00
Alex Buynytskyy
feaccc5be9
Merge "create owners" am: 00c3346e2d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565113
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic34bc41155854d3eb1867081f799edc6db158c6c
2021-02-01 02:59:24 +00:00
Remi NGUYEN VAN
a31d729863
Move module sources to packages/Connectivity
...
Files that are planned to be part of the connectivity module are grouped
in packages/Connectivity, so they can be built separately and moved in
one operation with their history into packages/modules/Connectivity.
This places the files in the existing framework-connectivity-sources
filegroup instead of the current framework-core-sources filegroup. Both
are used the same way in framework-non-updatable-sources.
Bug: 171540887
Test: m
Change-Id: I62d9d91574ace6f5c4624035d190260c3126b91e
2021-02-01 11:52:14 +09:00
Calvin Pan
d2d77dba7d
Merge "Add TelephonyShellCommand to get EAB contact"
2021-02-01 02:46:16 +00:00
Alex Buynytskyy
00c3346e2d
Merge "create owners"
2021-02-01 02:13:19 +00:00
Lorenzo Colitti
9db81cadec
Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b703
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e9dc75ac6430b70f28ddc974937a4f0d443bd28
2021-01-31 15:29:41 +00:00
Lorenzo Colitti
2836d8b703
Merge "Allow RNDIS and NCM to be enabled at the same time."
2021-01-31 14:27:45 +00:00
Jakub Pawlowski
132a502721
Merge changes Iec48eba9,I4358aac8 am: a0c7f5115f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566093
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0ae6b5d81dd7b51e2cea76de2619c997cebd147
2021-01-30 16:27:51 +00:00
Jakub Pawlowski
a0c7f5115f
Merge changes Iec48eba9,I4358aac8
...
* changes:
docs: fix typo HDP->HFP in BluetoothHeadset
docs: Use correct profile for intent
2021-01-30 15:29:21 +00:00
Treehugger Robot
7ebd138270
Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88745f4ab8a6d249678167a5cb4010aaa9568e01
2021-01-30 02:39:36 +00:00
Tomasz Wasilczyk
9768739095
Merge "Fix initialization of USER_ROTATION setting." am: 13466883b0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554929
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7551b1ce3883e85c0da8376424aeb9814a8832be
2021-01-30 02:17:19 +00:00
Kevin Han
95244bedc7
Merge "Introduce global package hibernation" am: 6857f6ed91
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb2e666ad166fba7c59c75d1428082aa9f2a6da5
2021-01-30 02:11:17 +00:00
Elliott Hughes
159155defe
Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6baddda3f36366349a7c67f13a043adeb83a089e
2021-01-30 02:05:59 +00:00
Junyu Lai
31522e92b4
Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" am: ac0dbac04c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If92b70b62029571082bba8e823d115cee2860a8d
2021-01-30 02:00:20 +00:00
Treehugger Robot
193dfa0a19
Merge "add shell user permissions for Asistant GTS tests"
2021-01-30 01:53:58 +00:00
Julius D'souza
3a91a2fdc2
Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE." am: 6131ca7d2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I439c953289b02c25a727d3f6c984b20eaae4b24c
2021-01-30 01:25:40 +00:00
Tomasz Wasilczyk
13466883b0
Merge "Fix initialization of USER_ROTATION setting."
2021-01-30 00:55:53 +00:00
Kevin Han
6857f6ed91
Merge "Introduce global package hibernation"
2021-01-30 00:37:19 +00:00
Nicholas Ambur
57969acf86
add shell user permissions for Asistant GTS tests
...
Bug: 177271291
Test: gts-tradefed run gts -m GtsAssistIntentTestCases
Change-Id: I6c6134a9912a73039556a4d700bbb0bb97b6b3d4
Merged-In: I293d66811f8a27170f2bc4cb74b7d4c9ec55fac8
2021-01-29 16:28:19 -08:00
Elliott Hughes
1528efe4b1
Merge "Remove __ANDROID_API__ #if checks."
2021-01-30 00:15:18 +00:00
Varun Shah
acb36aadda
Merge "Fixed to prevent usagestats file corruption when writing" am: 98fc96fc65
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550659
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic8cff49d1ea647f0a2ec16ba3eed7a4f54c091d1
2021-01-29 23:51:26 +00:00
Steven Moreland
ac37ade768
Merge "WatchDog: support dumping AIDL HALs" am: 4c0600b406
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564415
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1fa34ec1480e4ea584b4e5dc5c528d4168120d26
2021-01-29 23:44:22 +00:00
Tianjie Xu
3339f21560
Merge "Fixes how unbindService works" am: b7682d401f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I16e115505e4b3c2ac0c9fe78e82b704cb1ce4ceb
2021-01-29 23:31:30 +00:00
Leon Scroggins
8e3cdfb050
Merge "Apply bilinear filter for Ninepatch." am: 59e8bb9e98
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550596
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2bd4a061e3f18f43eff091c3bfb858fee2f0d80
2021-01-29 23:28:11 +00:00
Amit Mahajan
56efb4fa2b
Merge "Add config config_voice_data_sms_auto_fallback" am: 0a35aae9d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433920
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4413bf936d1cc129b3b14442cd91bced306c7c1
2021-01-29 23:24:35 +00:00
Junyu Lai
ac0dbac04c
Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations"
2021-01-29 23:15:32 +00:00
Etan Cohen
af364469e5
Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce98e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf4c8e505f9ea5db7d8581b90825baef5624e9dc
2021-01-29 23:14:45 +00:00
Cody Kesting
89a75849c2
Merge "Allow system components to request underlying network policies." am: ba04ef8481
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cdd1d5624d1f41cd80b6353466af49d5e59a81b
2021-01-29 23:10:36 +00:00
Junyu Lai
1800e22426
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: 6194d765d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556552
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d3eb542b1c3a9aabf51c58b8d83ad3e669f2077
2021-01-29 23:04:04 +00:00
Treehugger Robot
b327283c1d
Merge "add ownership" am: c63817d8f0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563872
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee5e276a3a67b8ce25490246628878f09dee9b11
2021-01-29 22:59:27 +00:00
Julius D'souza
6131ca7d2f
Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE."
2021-01-29 22:56:00 +00:00