Commit Graph

768091 Commits

Author SHA1 Message Date
Arthur Hung
d0d3b9240e Merge "Fix back gesture send to wrong focus window" into tm-dev am: 4bf81d5758 am: dc621522ac am: e437099db4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17990066

Change-Id: Iaf29d93850ddf2cbb0eb335855c739675f05b12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:14:36 +00:00
Jacqueline Bronger
500df7f0d3 Merge "Add more information to the TV PiP notification" into tm-dev am: b6de832709 am: 762b8b6972 am: 81dbc596ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197863

Change-Id: Iba4a910613740d16195a991ade268124d4819d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:14:11 +00:00
Automerger Merge Worker
a99a8bf772 Merge changes from topic "am-a928ff36c77e4f0eb02dd490b1d820e5" into tm-qpr-dev-plus-aosp
* changes:
  Merge changes from topic "am-d2f9204700b74fe8b08cf61658fc359c" into tm-d1-dev-plus-aosp am: 541fbb0ae4
  Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6f8 am: 7a450c60b3 am: 8377679fe1
2022-05-06 16:14:04 +00:00
Automerger Merge Worker
96d338dbb2 Merge changes from topic "am-d2f9204700b74fe8b08cf61658fc359c" into tm-d1-dev-plus-aosp am: 541fbb0ae4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: I0217a4be416063fe0361062fcffd3b468bfd97dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:13:58 +00:00
TreeHugger Robot
084ca0e55d Merge "Fix error in javadoc" into tm-dev am: 10ba4dab0c am: 327203d138 am: 84b6119c6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164946

Change-Id: Iec07b8039a6d93a5a2398bb2edfdde48b2a9de7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:13:49 +00:00
Vincent Wang
6d392d90b8 Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6f8 am: 7a450c60b3 am: 8377679fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: I92a1da4907c20912b564b8e9a38d68232314da20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:13:45 +00:00
Alex Johnston
4d171f8b26 Merge "Update DevicePolicyManager network logging docs" into tm-dev am: 7b1e39d5c1 am: 8eac50ce86 am: 99ae2e1c90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18138962

Change-Id: I6f4b21a83f3e557aa7664b417dacca3c322320cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:13:39 +00:00
Shawn Lin
59a3a2e1fe Merge "Don't create unexpected display cutout or rounded corners" into tm-dev am: 17267e883a am: 3026c72f44 am: 146a2e1a2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179577

Change-Id: I80ae9692e3ed222beb0aed85a5bb561d8a8c0fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:12:43 +00:00
TreeHugger Robot
988b41903c Merge "Updating TrustManagerService to react to keyguard visible changes." into tm-dev am: bd5592e65b am: 1047f17e62 am: 209d44a9b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18102036

Change-Id: I5f97b6f22dc92c1f9d1cfdce4a2a0595c53307c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:12:26 +00:00
Automerger Merge Worker
ef81689ec9 Merge "Merge "Attempt to fix LaunchAppShowImeOnStartTest" into tm-dev am: 0a6445f43b am: b4d6b2cd8b am: c1dd3c2782" into tm-qpr-dev-plus-aosp 2022-05-06 16:12:18 +00:00
TreeHugger Robot
9796963050 Merge "Attempt to fix LaunchAppShowImeOnStartTest" into tm-dev am: 0a6445f43b am: b4d6b2cd8b am: c1dd3c2782
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157813

Change-Id: Iafed9399df2ebf53935678950ba5f4b111b83e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:12:13 +00:00
Vincent Wang
944b28471d Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6f8 am: c3b378bf68 am: 097765f4e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: I599ddfe612b35af5cf4ad493c2df1f4ef4dca5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:12:08 +00:00
Vincent Wang
d6b2edbd14 DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor am: 29f4d11428 am: 51261139d8 am: 32a79b60bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: I80c6abea8f426e3cb7fd61f965342604e0123129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:12:05 +00:00
Automerger Merge Worker
2b74c84695 Merge changes from topic "am-cd9631face5c4d04a8c5cbf419cf92ae" into tm-d1-dev-plus-aosp am: 9a44a0d98b -s ours
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 ab0ee99c7b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185260

Change-Id: I69435accf5840977d98a0a07cdfe0783503eb87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:11:43 +00:00
Dave Mankoff
3f0c88f5cd [automerger skipped] Merge "Remove Dependency#get calls from NavigationBarView" into tm-dev am: bd9fe6ce24 -s ours am: 90343a4299 -s ours am: 3542124f10 -s ours
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 c6999a6640 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185260

Change-Id: I8dddf508df0895dec1107b13f01fe1fea43148ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:11:41 +00:00
TreeHugger Robot
43561480e6 Merge "Updating TrustManagerService to react to keyguard visible changes." into tm-dev am: bd5592e65b am: b0075d1b1d am: 8cda0aa38c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18102036

Change-Id: I6acfc7cb94f5b4d616320617ac1fbb01b1f79d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:11:07 +00:00
Automerger Merge Worker
08203543f6 Merge changes from topic "am-6e211d057385482094e3c15ffd4b3efe" into tm-qpr-dev-plus-aosp
* changes:
  Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6f8 am: 7a450c60b3 am: 87306bd5db
  DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor am: 29f4d11428 am: fedde47d82 am: ad34cc486e
2022-05-06 16:10:28 +00:00
Dave Mankoff
28561f4122 [automerger skipped] Merge "Remove Dependency#get calls from NavigationBarView" into tm-dev am: bd9fe6ce24 am: 4e76fdd51d -s ours am: 6df1b740dc -s ours
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 c6999a6640 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185260

Change-Id: I1a2a9dfc69e5960cdd8116a7b0b24bdec6b2a763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:10:19 +00:00
Vincent Wang
64cb7b1ecd Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6f8 am: 7a450c60b3 am: 87306bd5db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: Id874fa69fd333b0b7ccc1eef28b582e11e747ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:10:16 +00:00
Vincent Wang
6f53da272d DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor am: 29f4d11428 am: fedde47d82 am: ad34cc486e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130745

Change-Id: Id02382f4526282313eb47bd98cb4a0d4da4971c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:10:06 +00:00
Jackal Guo
5daf5a4e22 Merge "Fix dumping empty queriesPackages" into tm-dev am: dbd5719b68 am: d50b171103 am: 2bc2c4a0e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178886

Change-Id: I563d087de93d9a8681694de80c1890ce6822801e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:09:47 +00:00
Automerger Merge Worker
7ec996244a Merge "Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev am: d2c53f65f6 am: d9bb0149a6" into tm-d1-dev-plus-aosp am: 1c8dc13572
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937857

Change-Id: I3037095965f42c072aa4ed22734fce21162927db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:08:57 +00:00
Jackal Guo
4baaa60145 Merge "Fix dumping empty queriesPackages" into tm-dev am: dbd5719b68 am: 2e7d0bd1f4 am: 6eb599ba23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178886

Change-Id: If3de6f72d0ec772994606e668f04f6737ed64362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:07:31 +00:00
TreeHugger Robot
cfdb5d9ebf Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev am: d2c53f65f6 am: 59402af653 am: 7f15208caa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937857

Change-Id: Ia134a2508654b428effae5040e640b4845bdeac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:07:13 +00:00
Dave Mankoff
9819ee2063 [automerger skipped] Merge "Remove Dependency#get calls from NavigationBarView" into tm-dev am: bd9fe6ce24 -s ours am: 90343a4299 -s ours am: bb8fce0b6a -s ours
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 c6999a6640 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185260

Change-Id: I251938a18fbd42ea204e00a6f34ae2e350f8a509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:06:52 +00:00
Dave Mankoff
8b2c9712a0 [automerger skipped] Remove Dependency#get calls from NavigationBarView am: ab0ee99c7b -s ours am: 8f062bd901 -s ours am: 1f16fd192d -s ours
am skip reason: Merged-In I956e943504966fcecfd3da477535937a2aba7a9d with SHA-1 c6999a6640 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185260

Change-Id: Ide62493ee44020e1b40e5adf4d10a92700a64e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:06:39 +00:00
Jackal Guo
eed2f239e6 Merge "Fix dumping empty queriesPackages" into tm-dev am: dbd5719b68 am: 2e7d0bd1f4 am: dfc7dbdb65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178886

Change-Id: I1777f43cb02ea6a8585d69ab3838dcdba4aeb9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:02:48 +00:00
Automerger Merge Worker
0b87994772 Merge "Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev am: d2c53f65f6 am: 59402af653 am: c76e53c640" into tm-qpr-dev-plus-aosp 2022-05-06 16:02:38 +00:00
TreeHugger Robot
a0d2087b9d Merge "Rollback dropdown or inline suggestions when cancel fill dialog" into tm-dev am: d2c53f65f6 am: 59402af653 am: c76e53c640
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937857

Change-Id: I3d044861e9f71bf78bb23562710afc67e48b20d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:02:32 +00:00
Automerger Merge Worker
2ab7eacbe2 Merge "Merge "Consider adjacent launch target when recycling an existing task" into tm-dev am: a5619e3ff3 am: 986716f1c9" into tm-d1-dev-plus-aosp am: 6ba1c53c83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686876

Change-Id: I52eebcb41b5d37f562ff98bfe63d5e361cf5cd04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:02:24 +00:00
Jerry Chang
8bf6448188 Merge "Consider adjacent launch target when recycling an existing task" into tm-dev am: a5619e3ff3 am: ae770b3465 am: 4497e41aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686876

Change-Id: I72b8b77728bff906256f8a20870674c1d6b16b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:02:04 +00:00
Automerger Merge Worker
64f2f1b13e Merge "Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a28f am: bbc581b794" into tm-d1-dev-plus-aosp am: 1365747bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152523

Change-Id: I67f43519d4b72c66e44861d2c451baa38828d7dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:01:53 +00:00
Avichal Rakesh
38b300ea65 Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a28f am: e8bffd4dbb am: 8ebabfb3df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152523

Change-Id: I36db4534cf3685eea9046899ae090225d345a6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:01:24 +00:00
Automerger Merge Worker
cd2a852b1a Merge "Merge "Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev am: abeb3828cb am: af3dc5f9a3" into tm-d1-dev-plus-aosp am: 3c8f5db87a" into tm-qpr-dev-plus-aosp 2022-05-06 16:01:15 +00:00
Jerry Chang
aca3103812 Merge "Consider adjacent launch target when recycling an existing task" into tm-dev am: a5619e3ff3 am: ae770b3465 am: 7fb69a9993
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686876

Change-Id: I51e39025fc5d4585b6fdf958a08ed0e9688a0f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:01:05 +00:00
Automerger Merge Worker
da7e255af9 Merge "Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev am: abeb3828cb am: af3dc5f9a3" into tm-d1-dev-plus-aosp am: 3c8f5db87a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18181706

Change-Id: I564c8a27eaaa1694ab3f3ead14a99d2c6d16f9d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:00:59 +00:00
Avichal Rakesh
a0aae977ae Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a28f am: e8bffd4dbb am: 9dcb3dfa9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152523

Change-Id: I3709b73aff17c58f7317f3599385add2c6e73598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:00:53 +00:00
Jing Ji
1ec797392f Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev am: abeb3828cb am: e615ba7f40 am: a8a2da8686
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18181706

Change-Id: Ib5cac37f7f344026dedef14e00b14ae861d22e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:00:37 +00:00
Automerger Merge Worker
4369cb5df8 Merge "Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: 284657d0ae am: 86b0c3e673" into tm-qpr-dev-plus-aosp 2022-05-06 16:00:29 +00:00
Automerger Merge Worker
2cc32e8d19 Merge "Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev am: abeb3828cb am: e615ba7f40" into tm-d1-dev-plus-aosp am: be7a48cd68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18181706

Change-Id: I34a24e41f520a7651d57e8cdbb5a1b102626a26d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:00:25 +00:00
TreeHugger Robot
0297ca6293 Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: 284657d0ae am: 86b0c3e673
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104867

Change-Id: I2725950fec75eba80f52cb236bda6bf750a1b798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:00:24 +00:00
Peter Kalauskas
763550281a Merge "Cache SHOW_MEDIA_ON_QUICK_SETTINGS" into tm-dev am: f944c4856f am: 76b22b3ee2 am: a432f655d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18151331

Change-Id: Idc7f51e1df09f13af18d43008c71ecda5b02fc25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:00:10 +00:00
Automerger Merge Worker
18a01302f1 Merge "Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: 7f4b2d663f am: a0f80ed8d5" into tm-qpr-dev-plus-aosp 2022-05-06 16:00:05 +00:00
TreeHugger Robot
c5f8548d99 Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: 7f4b2d663f am: a0f80ed8d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104867

Change-Id: I4cfb0d8622b33389ac345119eadff5ed58ab6c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:00:00 +00:00
TreeHugger Robot
7efc9d5e1f Merge "Fully migrate tv to notification permission" into tm-dev am: 3c59d6c155 am: 9f46c9e343 am: 74a7065a6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122121

Change-Id: I9ed07597368cfa751888fa0d31d5d1eb45484661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:59:58 +00:00
Automerger Merge Worker
61e6d4d55f Merge "Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: 284657d0ae am: 64d11ca2d5" into tm-qpr-dev-plus-aosp 2022-05-06 15:59:52 +00:00
TreeHugger Robot
ab6db1832b Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: 284657d0ae am: 64d11ca2d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104867

Change-Id: I369cf8b1552608c7df1cfe7a3077697e568b36d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:59:48 +00:00
TreeHugger Robot
8fb7fb33a7 Merge "Add traces of the size of HWUI shader cache in RAM" into tm-dev am: b8b3c2d6f3 am: 9719bb8970 am: fb328a7166
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18149800

Change-Id: I1e0665d5133d48a9404a075fba72ba69688cec60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:59:45 +00:00
Automerger Merge Worker
0b8dc4bf62 Merge "Merge "Cache SHOW_MEDIA_ON_QUICK_SETTINGS" into tm-dev am: f944c4856f am: f145dc27b4 am: b48ac9d99f" into tm-qpr-dev-plus-aosp 2022-05-06 15:59:39 +00:00
Peter Kalauskas
ecd65719f8 Merge "Cache SHOW_MEDIA_ON_QUICK_SETTINGS" into tm-dev am: f944c4856f am: f145dc27b4 am: b48ac9d99f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18151331

Change-Id: I1c7af21c116061acd50347698043dee85289d8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:59:34 +00:00