Anton Hansson
f90849a2d1
Merge changes If81cda01,I1df8b8e0 am: 3351717493 am: 389332a285
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id7c521e779ba55f7bea832ade8ff92d9465339bd
2021-02-01 15:21:06 +00:00
Anton Hansson
15278c6c7d
Limit build visibility of modules in apex/... am: 096a1756fb am: 285c6a2018
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic00979a482e8ae725a57dee8c0e59b8dd296cad6
2021-02-01 15:21:02 +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
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
4cb54827a0
Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf am: 2425886baa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I309434985d7dc6c1cbcb411f6f08ebc4dc5d37d4
2021-02-01 12:20:27 +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
Nicolas Geoffray
8bd985efd4
Merge "Support for showing percent progress in boot animation." am: 87d840addd am: b86c3a3470
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4b699c54e725f6bde23d9f0123536bd2f0d6366
2021-02-01 11:02:58 +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
TreeHugger Robot
6564036dd7
Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev am: b72db4c52f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13381993
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic87f4b68581208c48f3ee229adf978aeaee1d09e
2021-02-01 09:32:24 +00:00
raylinhsu
9471fe8d50
Added to enable/disable log for DisplayModeDirector am: f6247e3d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13372399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I241ea5f3f2a05eefaed0f4e4a9c0488afe9437ee
2021-02-01 09:32:03 +00:00
TreeHugger Robot
b72db4c52f
Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev
...
* changes:
Fix ambient information which did not get for locking refresh rate
Added to enable/disable log for DisplayModeDirector
2021-02-01 08:47:45 +00:00
Remi NGUYEN VAN
546e2e895f
Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb am: 5acf0f78fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8261b01b976b4d8009cd028fa113ef8bede74acb
2021-02-01 08:41:56 +00:00
Chalard Jean
8cb7e186cd
Merge "Start VcnManagementService after ConnectivityService" am: 1595b1aa38 am: 356c6725c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539845
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6accd63f8570a944758596319689266837c1dc94
2021-02-01 08:41:48 +00:00
Calvin Pan
a0927df3f1
Merge "Add TelephonyShellCommand to get EAB contact" am: d2d77dba7d am: e532d3be62
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8886623de1860bdf14584ff061bfdd808c043154
2021-02-01 08:41:22 +00:00
Alex Buynytskyy
9f3cfe4c82
Merge "create owners" am: 00c3346e2d am: feaccc5be9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565113
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c1c38db1703bcb3eb3e51979dd78af723da9487
2021-02-01 08:41:04 +00:00
Lorenzo Colitti
677fbbbedc
Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b703 am: 9db81cadec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia7e6e4698f80bc70112e9338c5c5ff27cbd248ce
2021-02-01 08:40:49 +00:00
Jakub Pawlowski
9dd3a7b6a0
Merge "resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp
2021-02-01 08:19:47 +00:00
Bill Yi
44b9940c4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c894d63476 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13439180
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I287d5cca01989d48cf23e64a0b969c542455d8e1
2021-02-01 07:30:24 +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
raylinhsu
f63122d51e
Fix ambient information which did not get for locking refresh rate
...
Sometimes we will see that the display state is ON but the
DeviceInteractive is false and then BrightnessObserver can not register
the light sensor.Hence, it can not judge if the threshold meets the
condition for blocking zones.This patch is for fixing this kind of
case.
Bug: 176018998
Test: atest DisplayModeDirectorTest
Test: no fps transition in the blocking zone when the display state change
Test: check if the lux will update when the display state change
Change-Id: Idcfcbfa9e41bb9a34e4808db6fdd7f8a5901457b
Merged-In: Idcfcbfa9e41bb9a34e4808db6fdd7f8a5901457b
2021-02-01 05:57:42 +00:00
raylinhsu
f6247e3d30
Added to enable/disable log for DisplayModeDirector
...
Added to enable/disable log for DisplayModeDirector dynamically
Bug: 176018998
Test: enable DMD logging with
$adb shell cmd display dmd-logging-enable
This should start logging the collected for DMD.
You can filter it with :
$adb logcat | grep 'DisplayModeDirector'
Change-Id: I66478dda66d5d89193ef1838ab3afca94bf72313
Merged-In: I66478dda66d5d89193ef1838ab3afca94bf72313
2021-02-01 05:57:21 +00:00
Bill Yi
c894d63476
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24a8b519e96a7b5122d079e058d859fb57d78366
2021-02-01 05:26:01 +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
7cd99c47bb
resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5
2021-01-31 00:40:24 +01: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
Muhammad Qureshi
278b741e3a
Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32def am: e3b7b329c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie81d4767c721674124bf7e4b00778c85f67440da
2021-01-30 03:59:49 +00:00
Muhammad Qureshi
2e7b3476cf
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent. am: 53251a491f am: 60b00ec30f -s ours
...
am skip reason: skipped by user muhammadq
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86e796e3caa7be0d362ca08de4a2887dfb77c68c
2021-01-30 03:59:37 +00:00
Treehugger Robot
71375c86d8
Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 am: 7ebd138270
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id05953c7bdb08255d248b5f755d262dfa8098af5
2021-01-30 02:52:14 +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
12824746c7
Merge "Fix initialization of USER_ROTATION setting." am: 13466883b0 am: 9768739095
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554929
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc56ca2a3d933b34b125719a6492477e05695694
2021-01-30 02:31:28 +00:00
Muhammad Qureshi
e3b7b329c9
Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32def
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44049f158a5aa39049ba1bf0443b70de6679527d
2021-01-30 02:30:15 +00:00
Kevin Han
9785e97602
Merge "Introduce global package hibernation" am: 6857f6ed91 am: 95244bedc7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I780c3f8d4d3288d77f479a93c3ea41ad052dc4bd
2021-01-30 02:30:14 +00:00
Muhammad Qureshi
60b00ec30f
[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent. am: 53251a491f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1da4a9159e5611d80c618913f728defb5399d927
2021-01-30 02:30:06 +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
Elliott Hughes
b6dd5e5fb5
Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1 am: 159155defe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb1e8c7f8ba5c99b7f33b65c130f9ec3d0fb6498
2021-01-30 02:15:16 +00:00