Vishnu Nair
1be5898ce7
Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0 am: bd61cfb0be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803
Change-Id: I023df7ad8d9ef2bad9cd4c7cc036b4159bdf0fa9
2021-09-28 21:07:16 +00:00
Vishnu Nair
b866c0323a
Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0 am: 9bbf9cd727
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803
Change-Id: Ic659035d5ed05e2927d672f52b52ee31e87ee9d4
2021-09-28 21:06:48 +00:00
Vishnu Nair
9bbf9cd727
Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803
Change-Id: I066ec21a0a3874081a3aa17ea7e6a0b9f1bb0ffc
2021-09-28 20:54:37 +00:00
Vishnu Nair
bd61cfb0be
Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803
Change-Id: I3b7d501067ccdb716ae892fa4ccd34b2722b7ab7
2021-09-28 20:54:36 +00:00
Vishnu Nair
8dc8182ad0
Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev
2021-09-28 20:38:42 +00:00
Jorge Gil
42ca299bd4
Merge "Do not change launch mode to FF is FS explicitly requested" into sc-v2-dev am: 7c2508117c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15910695
Change-Id: I339ec385c2214fb3e7406c1b6ab4c2986365e46b
2021-09-28 20:21:41 +00:00
Jorge Gil
7c2508117c
Merge "Do not change launch mode to FF is FS explicitly requested" into sc-v2-dev
2021-09-28 20:05:53 +00:00
TreeHugger Robot
932a7a167c
Merge "Revert "Remove Dependency.get from NavigationBar."" into sc-v2-dev am: b14bcefcb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934625
Change-Id: Ib0d7f8e97b805fede612868780472d1ff83ad6ca
2021-09-28 19:55:27 +00:00
TreeHugger Robot
b14bcefcb1
Merge "Revert "Remove Dependency.get from NavigationBar."" into sc-v2-dev
2021-09-28 19:37:41 +00:00
Nader Jawad
8bfa3e04a4
Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178 am: 15d37532bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060
Change-Id: I97799873785f4480427a25dec70b94f0eb270dca
2021-09-28 19:20:39 +00:00
Nader Jawad
fd2133a687
Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178 am: 201db897ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060
Change-Id: I4e1cde89cc83a6cf4e06131691aea0aaa54dae82
2021-09-28 19:20:17 +00:00
Nader Jawad
15d37532bf
Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060
Change-Id: I601044300fbea039823b2bfad37d59cc4fec6ed5
2021-09-28 18:40:58 +00:00
Nader Jawad
201db897ea
Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060
Change-Id: Ie233dd9f6628ac6780dd0b96d8eca97d7892b929
2021-09-28 18:40:56 +00:00
Nader Jawad
be0bdf6178
Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev
2021-09-28 18:24:42 +00:00
Jerry Chang
81504bcc8c
Merge "Dispatch organized tasks info chagne when committing visibility" into sc-v2-dev am: 05b2d626e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926312
Change-Id: Idf7bcd77ace89a81ce8348ef143eda42bd271f53
2021-09-28 18:16:29 +00:00
Treehugger Robot
a4f620a730
[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours am: daf25cf47c -s ours am: 4895ad6bd9 -s ours
...
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794410
Change-Id: I9acaa94297b0ef31f5c2c78d36c926ab005f10e8
2021-09-28 18:16:03 +00:00
Jerry Chang
05b2d626e6
Merge "Dispatch organized tasks info chagne when committing visibility" into sc-v2-dev
2021-09-28 18:05:34 +00:00
TreeHugger Robot
347557e905
Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev am: 80fcbc8fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810445
Change-Id: Ibfce3c573e7cc136226599500e438527a1565075
2021-09-28 18:02:38 +00:00
Treehugger Robot
4895ad6bd9
[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours am: daf25cf47c -s ours
...
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794410
Change-Id: I32a4842c436d73a67c98b0e11ce50e05bf54c051
2021-09-28 17:53:39 +00:00
TreeHugger Robot
80fcbc8fe0
Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev
2021-09-28 17:50:34 +00:00
Vishnu Nair
f0ae9acf36
ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout
...
The opaque flag is necessary for the compositor to blend the layers
correctly and prevent translucent pixels from showing the layer
underneath during animations.
Test: manually punch holes in apps and verify opaque apps don't show the layer underneath
Test: automated tests to follow
Bug: 198924563
Change-Id: I1116c51b2efd4e9c0fe2acbca080291f3950245c
2021-09-28 17:45:10 +00:00
Treehugger Robot
daf25cf47c
[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours
...
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794410
Change-Id: Ia7abdd3c4f8222c116a02aed2d6b8052f51c63a5
2021-09-28 17:44:04 +00:00
Treehugger Robot
5f35a1d2d3
[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours
...
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794410
Change-Id: Ia70e96971d08dd32587c38e344e97f145573ba0d
2021-09-28 17:29:20 +00:00
Dave Mankoff
be525911ce
Revert "Remove Dependency.get from NavigationBar."
...
This reverts commit 9f8305196c .
Reason for revert: http://b/201416807
Change-Id: Iab917251e00c3ab2ef9f44835728abd93eb16fa5
2021-09-28 17:23:33 +00:00
Treehugger Robot
d801feda70
Merge "Fix stuck HDMI-CEC actions after boot"
2021-09-28 17:16:41 +00:00
Eric Laurent
947dbfd41c
[automerger skipped] Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c25 am: 04abcfed22 -s ours
...
am skip reason: Merged-In I095224347b5f5c200f4a8f0dd147f63c0119dc85 with SHA-1 c9faa86b66 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897410
Change-Id: Iad6aba98eb0511ad5303164ff7ba367e9c9cf494
2021-09-28 17:07:36 +00:00
Eric Laurent
9571037530
Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c25 am: 6b85e8e831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897410
Change-Id: I278f2eaa512ffa5e725c96ae01b4ddc4d03cc53a
2021-09-28 17:07:02 +00:00
Eric Laurent
6b85e8e831
Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897410
Change-Id: I8508f8507e3b28c06584517ecaed0d791a681846
2021-09-28 16:53:28 +00:00
Eric Laurent
04abcfed22
Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897410
Change-Id: Ifdb3db63337b69ca4e6b87ce92084519fd844c4a
2021-09-28 16:53:16 +00:00
Eric Laurent
50d7e14c25
Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev
2021-09-28 16:38:34 +00:00
Mohammad Islam
61cdc7f9a8
[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours am: 430ef242c4 -s ours am: efa70ccb43 -s ours am: 0b3fa2a944 -s ours
...
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836298
Change-Id: I53e176457731fa38dc8bac2f07c9f1d0eed9c732
2021-09-28 16:25:00 +00:00
TreeHugger Robot
45ec6c69b4
Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 am: a0677a8011
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909
Change-Id: I8bd544f28b5b14a411642f35e003d1bf6c75400b
2021-09-28 16:24:31 +00:00
Mohammad Islam
0b3fa2a944
[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours am: 430ef242c4 -s ours am: efa70ccb43 -s ours
...
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836298
Change-Id: I02f612c50a6455c48285734dbe0946bcc6b05c83
2021-09-28 16:16:25 +00:00
TreeHugger Robot
5073863f02
Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 am: 68da7eade2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909
Change-Id: I37f919379396dca5dc1e99899838e9f10e1cdf7f
2021-09-28 16:16:06 +00:00
TreeHugger Robot
a0677a8011
Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909
Change-Id: I8bad578d9be53a2304c623f930fd209a893e2245
2021-09-28 16:07:41 +00:00
TreeHugger Robot
68da7eade2
Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909
Change-Id: Iff4cf49bd791e9db5cc72f399e5e92272b217e8e
2021-09-28 16:07:39 +00:00
Mohammad Islam
efa70ccb43
[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours am: 430ef242c4 -s ours
...
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836298
Change-Id: Id2b0a40c57d9d7db822a1868a19f74e52b772bc3
2021-09-28 16:07:09 +00:00
Mohammad Islam
430ef242c4
[automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours
...
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836298
Change-Id: If953a25bd4c4a03cd336570a7dd7113db161542e
2021-09-28 15:56:13 +00:00
TreeHugger Robot
97e242b331
Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev
2021-09-28 15:52:35 +00:00
Mohammad Islam
0fe46d947a
Merge "Fix broken test on GSI branch"
2021-09-28 15:37:08 +00:00
TreeHugger Robot
f4f7ffcf3c
[automerger skipped] Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06da5 am: 7414295369 am: a2cbc7a4e0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695
Change-Id: Ic0e24c58d8ea0c18f16620dafac0a933ec8de64d
2021-09-28 15:23:11 +00:00
Xin Li
e8000b18a0
[automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2 am: 0d5ffa548a am: e7f27bb145 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695
Change-Id: Ide7ab73428383461053f65e59c22e049b012321f
2021-09-28 15:22:44 +00:00
TreeHugger Robot
a2cbc7a4e0
Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06da5 am: 7414295369
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695
Change-Id: I8110bda1bf064abbcd026081380fa65bb528ece7
2021-09-28 15:02:01 +00:00
Xin Li
e7f27bb145
DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2 am: 0d5ffa548a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695
Change-Id: I481963a4a1c5fd23fa092abaef206c5f67c2488f
2021-09-28 15:01:38 +00:00
TreeHugger Robot
0931e446e5
Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master am: 5d7bfac82a am: 80df3099d1 am: 75b045da0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930804
Change-Id: I413e2e7640424e5c12b078d1d946ce339e809acd
2021-09-28 14:44:09 +00:00
TreeHugger Robot
7414295369
Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06da5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695
Change-Id: Icda2875610fea73a69cea7056ad889b253df655f
2021-09-28 14:43:35 +00:00
Xin Li
0d5ffa548a
DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695
Change-Id: I937fcca2c512b83c4439754b8507b3219b653807
2021-09-28 14:43:10 +00:00
TreeHugger Robot
75b045da0d
Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master am: 5d7bfac82a am: 80df3099d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930804
Change-Id: I167e33c5661d219e44afdb086e09621b77967ef3
2021-09-28 14:24:28 +00:00
TreeHugger Robot
50513b9315
Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-v2-dev am: 72bf1a1f38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15923735
Change-Id: I687b9c3626bb9315a016012a98f84897dcb816f6
2021-09-28 14:19:17 +00:00
Matt Pietal
d9dd674e6a
[DO NOT MERGE] Smartspace - Don't create session ahead of init am: 1c12757203
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15923735
Change-Id: Iee48bfc717df5fdfedf0b0f9327bb1ad274da95e
2021-09-28 14:19:11 +00:00