Varun Shah
17e33aff66
Merge "Link BatteryTrackerInfo to the metrics logging." into tm-dev
2022-04-20 05:17:19 +00:00
Steven Moreland
d10a11f735
[automerger skipped] Merge changes from topic "aidl-java-api-ci" am: 6f7ec05bd0 am: ddc5cf909c -s ours am: 0fb49b04db -s ours
...
am skip reason: Merged-In I274f847ed8156acd0c4b288e306fcab2d380bcd5 with SHA-1 32d2c1bf21 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2054926
Change-Id: I1bdc03047d390ab9d10ec79bf3e9f8f658dc3724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:03:18 +00:00
Steven Moreland
138279281d
[automerger skipped] Implement getInterfaceHash/Version (health) am: cab8148a75 am: c1e351468b -s ours am: 9d4cafcbd9 -s ours
...
am skip reason: Merged-In I01dda85890dae59082067e4b38c0f50d493cd22d with SHA-1 04268342c9 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2054925
Change-Id: Ie92beaad19fc645ae0b3a373a2c3cd885bbd966c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:03:06 +00:00
Bill Yi
e37c092358
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f93e051460 -s ours am: 531503681f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800856
Change-Id: Ia97f9cc63c9a29dbe70a6501f6c9673ad2ddd3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:02:34 +00:00
Bill Yi
edf7bc7094
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae18e0f8dd -s ours am: 052e85af2a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800856
Change-Id: I8c9cc6cd3e422bac6c3356489f5cbbd2be4e120a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:02:22 +00:00
TreeHugger Robot
3beee40430
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 89c279bf62 -s ours am: 7c914f88a7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17795866
Change-Id: Ie20d19fecb5c1c59fcf5413516c0f575dec28a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:02:04 +00:00
Bill Yi
28db724531
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8edca0937b -s ours am: 62b7972176 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17795866
Change-Id: Id08713a064401fb64bbe7b7c34d5040704b8cc98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:01:55 +00:00
TreeHugger Robot
61600277cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: eb26f2e938 -s ours am: 1a1838915e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796127
Change-Id: Icc63ce5a305851eca659f6a6c991d18445660186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:01:35 +00:00
TreeHugger Robot
7b8160047d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 92e51f6748 -s ours am: abd71b765e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796135
Change-Id: Ib3b579730fb0f9e5603a3fe4aef6cf736132ca6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:01:16 +00:00
TreeHugger Robot
7aee6ba1f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 84ce23e7e2 -s ours am: 9beacdb3cf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796137
Change-Id: Ib411e98a51944a89d26af153916ed74cc268b5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:01:00 +00:00
TreeHugger Robot
0e1f3d8183
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0f0c1b153c -s ours am: 927318dc07 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17785720
Change-Id: I908fb101f56df8e8ecd0c5155db4e2c7ec9d8c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:00:30 +00:00
TreeHugger Robot
e6f0d880c5
Merge changes from topic "presubmit-am-34bbef0f4bf04e02ac6082d10b45a7e9" into sc-v2-dev-plus-aosp am: 9cd00f77df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796127
Change-Id: Id2f39f416ac113b28b7a03bb5323cc8c3e41bb7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:00:05 +00:00
Bill Yi
1450a6e602
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2e980c1356 am: d6981a9415 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796127
Change-Id: Ia450cc1b0148f76729e5bea6046f4a863e11029b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:59:52 +00:00
TreeHugger Robot
f94e38b5db
Merge changes from topic "presubmit-am-86d3b292394544e49980c58589b30bac" into sc-v2-dev-plus-aosp am: 5a9f71334e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796135
Change-Id: I8ed38c794707b16c37b1c6daa362b27fc1f8f94f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:58:42 +00:00
Bill Yi
6d8a67869b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4594f053 am: 8b23123813 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796135
Change-Id: I78f1b29715955034af7eac4126c43c41c56ef160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:58:33 +00:00
TreeHugger Robot
7127d31731
Merge changes from topic "presubmit-am-94a561089c1a4d33b7bc5d6586457e84" into sc-v2-dev-plus-aosp am: 6e68c71fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796137
Change-Id: I753fd9a62a3df4113ddecf7cfcdbc21d1a4ee898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:57:26 +00:00
Bill Yi
cea0dd1730
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 76d025a3c9 am: f16d02fbd2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796137
Change-Id: I7c06d4a13fb54998d2e8a13e0c3f13c2c692ebfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:57:15 +00:00
TreeHugger Robot
c782e32d57
Merge changes from topic "presubmit-am-aa0156d808284b11b80b5fc6b19627ec" into sc-v2-dev-plus-aosp am: 4b77a598b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17785720
Change-Id: I26bfc7553624523a2ce3232ca46dad32652205fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:56:31 +00:00
Bill Yi
5084c2d17a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c4fa98de5d am: 38154d7cf1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17785720
Change-Id: I709669f7f3a4844fa0e7eedb6fa65bc689f3bf65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:56:10 +00:00
TreeHugger Robot
2e83ed960d
Merge changes from topic "presubmit-am-7f9c15ce2f1a41e98cec0dbcd8143ed2" into sc-v2-dev-plus-aosp am: 4e13e7e527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784981
Change-Id: I348ebd2addc353adffa01833b8596acf488c6b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:54:54 +00:00
Bill Yi
3c9787fe38
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bafd391f4c am: 601a5dcbef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784981
Change-Id: Ic12102cae47a4df2daf82955af2145aebe237725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:54:43 +00:00
Xin Li
6bffcabcb2
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: b2f021295c -s ours am: b6430ab931 -s ours
...
am skip reason: Merged-In I6541f7d49cb932c85374bf9acf777038b888e873 with SHA-1 584cde2e6d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805005
Change-Id: I346f952f8743e4789e7bb893ae12ecda2b1add7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:47:30 +00:00
Sudheer Shanka
7789dfbcdd
Merge "Fix javadoc on Context#BIND_FOREGROUND_SERVICE." am: d8705358c6 am: 33c901faa0 am: 87f1412190
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065471
Change-Id: I073708caa4a94b4b17d444e977fc464518ce0cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:37:08 +00:00
Yan Yan
780a2b31bc
Merge "Maximize VCN MTU when using IPv6" am: 6d70c7f36a am: 8f8e80779a am: 30ac2c94d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063435
Change-Id: I0de762eeadbb7218f1b41c18d2475b459c722a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:36:30 +00:00
Sooraj Sasindran
92d7217fd0
Merge "Fix signal threshold boundaries for NR" am: 865dcdbfb0 am: 76a9680291 am: 89c5ba1424
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2018775
Change-Id: I4c0a45cb012b3b76ea31287a05c3844686bed9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:35:02 +00:00
Jay Aliomer
1ed5bbda85
[automerger skipped] Merge "Revert "Enable new data stack by default"" am: f92fa673da am: a1f8e1c584 am: a08368b334 -s ours
...
am skip reason: Merged-In I6d22205b733cb5d579b8da6f1e66f31437b20db1 with SHA-1 616898d167 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051832
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065671
Change-Id: Id3d5fe871c0991d62b1247784b5f4ceb618ac108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:34:29 +00:00
Treehugger Robot
b652c290ee
[automerger skipped] Merge "Enable new data stack by default" am: d422089d89 am: 92210365e1 am: c801888f8c -s ours
...
am skip reason: Merged-In I6d22205b733cb5d579b8da6f1e66f31437b20db1 with SHA-1 616898d167 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051832
Change-Id: I86de3d940e6d5d6d817de0b01a83f972880c975c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:34:04 +00:00
Wonsik Kim
9cd745cee6
Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode" am: 61c2096dbc am: 996fc3da05 am: 6e2b382afc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065608
Change-Id: I46f407b866252596881ead630ea06704806f1fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:33:22 +00:00
Hongwei Wang
5cb6c5a9c9
Merge "Validate target view surface in PipDismissTargetHandler" into tm-dev
2022-04-20 04:28:26 +00:00
Tony Huang
34e18413a8
Merge "Remove some functions @hide in WindowContainerTransaction" into tm-dev
2022-04-20 03:35:17 +00:00
easoncylee
e2be3244e8
Convert apct/managed_provisioning/presubmit_test to Test Mapping Suite.
...
This CL is to convert CF presubmit tests to run in Test Mapping suite.
It has been verified that the test coverage is the same as the original
ATP config.
Bug: 145165552
Bug: 145574049
Test: TreeHugger
atest ManagedProvisioningTests
Merged-In: I8234cc5cadae2ed2162cb09ec8695c7262fcdb2e
Change-Id: I268448e682b7c45741a62fa3bc1157986f3827d1
2022-04-20 11:31:13 +08:00
Bill Yi
90aca266a3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0b5b2723cb226b8a64758586fa3797d08911dbee
2022-04-20 03:17:18 +00:00
Beth Thibodeau
f1ea23510a
Add debug logging for media view events
...
Test: manual; verify present in bugreport
Bug: 198319256
Change-Id: I416d532758cc280a6ea05f45bccdb3dcd81abe34
2022-04-20 02:50:52 +00:00
Daniel Hsieh
8fbc44fb78
Merge "Fixes flaky tests" into tm-dev
2022-04-20 02:46:33 +00:00
Hakjun Choi
e026d4c179
Correct Typo on Provision Refactor per API review
...
1) FeatureProvisioningCallback become abstract, which has empty impelemtation to override
2) Remove unnccessary {} from @hide
3) fix wrong comment for KEY_CARRIER_VOLTE_PROVISIONED_BOOL
4) move public interface RcsImsCapabilityFlag and it's component constants from RcsFeature to public class ImsRcsManager, and restore RcsFeature as SystemApi class
set as @deprecated for RcsImsCapabilityFlag in RcsUceAdapter, which has duplicate in ImsRcsManager.
Bug: b/219985687
Test: CTS/ImsServiceTest, UnitTest/ImsProvisioningControllerTest
Change-Id: Iea386922f0377e01582fdb6547d60126d0bf1e8d
Merged-In: Iea386922f0377e01582fdb6547d60126d0bf1e8d
2022-04-20 02:33:05 +00:00
shawnlin
bcea9fd89e
Support scaled cutout & roundedcorners when resolution is overridden
...
In current desgin, the confgis for cutout and rounded corner are based
on the original display size. If the display resolution is overridden,
cutous and rounded corners will be drawn in incorrect places with
incorrect size.
We should load the cutout & rounded corners with the orignal display
size and then scale the results with the display ratio which is
calculated by dividing current size with original size.
Bug: 209592558
Test: manual:
1. Go Settings-> Display-> Screen Resolution
2. Switch between FHD+ and QHD+
3. Check if the cutout and rounded corner looks the same as they
are in the original display size.
Test: manual:
1. adb shell wm size 1080x2340
2. Check if the cutout and rounded corner looks the same as they
are in the original display size.
Test: atest DisplayCutoutTest LocalDisplayAdapterTest
ScreenDecorationsTest RoundedCornerResDelegateTest
Change-Id: Iea42b73c0276b82983c1ddbce9455355afdc164d
2022-04-20 10:03:19 +08:00
Weng Su
258483bff3
Cache Wi-Fi state in worker thread
...
- The WifiManager.getWifiState() is a blocking API, It may not be
suitable for use on the UI thread.
- To avoid blocking the UI thread, we should cache the Wi-Fi state
from the WIFI_STATE_CHANGED broadcast to return immediately.
Bug: 226039078
Test: manual test
make RunSettingsLibRoboTests ROBOTEST_FILTER=WifiStateWorkerTest
Change-Id: Ia0443824975f01099e52f777c15468f30285f4c1
2022-04-20 01:52:34 +00:00
Varun Shah
dd74697750
Link BatteryTrackerInfo to the metrics logging.
...
Add a new interface method for state trackers to implement
when AppRestrictionController asks for relevant tracker info
for logging.
This CL specifically links the info from AppBatteryTracker.
Bug: 217744262
Test: statsd_testdrive 441
Change-Id: Ie97653e804a00a240bcff80556b6e5532e4becf4
2022-04-19 18:49:28 -07:00
TreeHugger Robot
f0af066196
Merge "Convert apct/managed_provisioning/presubmit_test to Test Mapping Suite." into tm-dev
2022-04-20 01:42:46 +00:00
TreeHugger Robot
b45f0e8ac6
Merge "Add MIDI info to USB dumpsys" into tm-dev
2022-04-20 01:13:19 +00:00
joneckenrode
e6cec1a2e4
Updated API documentation of screenWidthDp and screenHeightDp to include multiple-screen behavior.
...
Test: Built API docs
Signed-off-by: joneckenrode <joneckenrode@google.com >
Change-Id: I44aec14f1607e3ddabb7f792eac22da982347613
2022-04-20 00:20:42 +00:00
Yushin Cho
71032c8d67
fix API description on how to round average qp
...
Average QP is rounded to the nearest integer value.
Test: cts
Bug: 229778486
Change-Id: I16fca81dcab26462b9493784368d29c6b7748fd5
2022-04-19 23:22:21 +00:00
Bill Yi
2b98ef8a0c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifeed2eb20546165f6131c8994effd38423f5306c
2022-04-19 23:05:24 +00:00
Jing Ji
f38c1aa177
Merge "Exempt the device/profile owner protected pkgs from FGS task manager" into tm-dev
2022-04-19 22:29:20 +00:00
Chavi Weingarten
c9eb12f88b
Merge "Add SurfaceSyncer markdown file" into tm-dev
2022-04-19 22:08:31 +00:00
Hans Boehm
7f3e096b70
Don't MAP_POPULATE native ZygoteCommandBuffer
...
Since we made it significantly larger, populating it will often waste
a bit of space.
Belated follow-up to aosp/2009575 .
Test: Build and boot AOSP.
Bug: 219763513
Change-Id: I5fdbd379942e92df52c079e52e35ebbee0429577
2022-04-19 15:05:13 -07:00
Bill Yi
419aedc23d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib7441920a4218ab19cf991c5e4829d75ef57546f
2022-04-19 21:07:35 +00:00
Bill Yi
efcb53d0e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I37ecf92b1032cfd1820cefaca9929f46138d8a74
2022-04-19 20:59:34 +00:00
Bill Yi
8c46e49749
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7001ee0c8b45d120042495316cda245f9b0ae3f
2022-04-19 20:41:02 +00:00
Steve Elliott
1989bf4e1d
Remove pipeline construct thread asserts + effects
...
Fixes: 220644598
Test: manual
Change-Id: I1195630771ba9878e92a304b30c256b767bea0b6
2022-04-19 20:31:30 +00:00