Commit Graph

651508 Commits

Author SHA1 Message Date
Fiona Campbell
ee0641276d Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev am: d77459a21f am: 97f24b694e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551803

Change-Id: I21c071fb10720fdee4bd84a5bbf9de12daae8e2a
2021-06-17 14:06:11 +00:00
Fiona Campbell
b53055188f Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev am: d77459a21f am: 0052dcef93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551803

Change-Id: Iabaddbe0c15fd538d6b29d0d3a5b3790147c9819
2021-06-17 14:05:57 +00:00
Fiona Campbell
0052dcef93 Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev am: d77459a21f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551803

Change-Id: I7cb6750bf25d644c7c244b6bcc4d79bbc5a90559
2021-06-17 13:54:59 +00:00
Fiona Campbell
97f24b694e Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev am: d77459a21f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551803

Change-Id: I71749d5e0aefcbac60f112952e889fe5f6783759
2021-06-17 13:54:36 +00:00
Treehugger Robot
b3fef10d16 [automerger skipped] Merge "Create platformtestprotos." am: c06ebb02a2 am: 4ccdeba9eb -s ours am: 2523b1fbd6 -s ours
am skip reason: Merged-In I82386a6c8a5e6ddf42d8377148001f4ede2f297f with SHA-1 d61699e86c is already in history

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

Change-Id: Ib5545b3e1adfba148b37a9f5f3fbf325704c5d54
2021-06-17 13:52:13 +00:00
TreeHugger Robot
c30001da50 Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a am: 95dbd05204
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: Ieefcbcc20a57288de0fbdfd3da91a1a747363208
2021-06-17 13:51:58 +00:00
TreeHugger Robot
ca74f7bafd Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a am: 189de9bc1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: If28c7f06a7765d50d12be3521cfc28ee265531a7
2021-06-17 13:51:10 +00:00
Fiona Campbell
d77459a21f Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev 2021-06-17 13:41:45 +00:00
TreeHugger Robot
189de9bc1d Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: I8620aac4c330a5ea9e57a52323ce60fb722a16e1
2021-06-17 13:37:35 +00:00
Treehugger Robot
2523b1fbd6 [automerger skipped] Merge "Create platformtestprotos." am: c06ebb02a2 am: 4ccdeba9eb -s ours
am skip reason: Merged-In I82386a6c8a5e6ddf42d8377148001f4ede2f297f with SHA-1 d61699e86c is already in history

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

Change-Id: I81c81e0c28089929262a2da203dd14cb0ca7e72a
2021-06-17 13:37:31 +00:00
TreeHugger Robot
95dbd05204 Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: Id0ff298f70f2d71f9d86e18b4ed49e0ed0d29066
2021-06-17 13:37:13 +00:00
TreeHugger Robot
2c95c7632a Merge "Catch bubbles exception in PeopleTiles" into sc-dev 2021-06-17 13:26:52 +00:00
TreeHugger Robot
9b32768a27 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8 am: 8e03a241f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: Id877e2b590c4d65bd66c71e8196694c317c4772d
2021-06-17 13:25:40 +00:00
Mathew Inwood
e44c7cb70e Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c am: 5fe8ac2cbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: Ib31feca04764aecc30956ae8608a61383b604032
2021-06-17 13:25:33 +00:00
TreeHugger Robot
64939eeda1 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8 am: 5b7b95fb26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: I5e3a12231aeac0fa331cdb9dfaac455d88ceed4d
2021-06-17 13:25:08 +00:00
Mathew Inwood
dd7d22b8e0 Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c am: 6ea95fa4d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: If37f0a98a3977a8151ff3abe232802dc74e5c69b
2021-06-17 13:25:01 +00:00
Treehugger Robot
4ccdeba9eb Merge "Create platformtestprotos." am: c06ebb02a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1723395

Change-Id: Ia1186d6019a60bea41a65c7563824f895cf0c130
2021-06-17 13:12:15 +00:00
TreeHugger Robot
5b7b95fb26 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: Iac5e780c9384467e4b4e3c97606397ff024111a3
2021-06-17 13:10:43 +00:00
Mathew Inwood
6ea95fa4d2 Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: I2f671c19fdf58e3ad48ea1e28d33530bdd987263
2021-06-17 13:10:34 +00:00
TreeHugger Robot
8e03a241f5 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: I7f7d39e3212773a7349acd36dc3938d23870f921
2021-06-17 13:10:25 +00:00
Mathew Inwood
5fe8ac2cbd Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: Idb307077c0e7e116f406b54f1f1bb4e8962a9ddd
2021-06-17 13:10:00 +00:00
Treehugger Robot
c06ebb02a2 Merge "Create platformtestprotos." 2021-06-17 12:53:11 +00:00
TreeHugger Robot
0ec737dab8 Merge "KeyguardIndication text updates" into sc-dev 2021-06-17 12:48:23 +00:00
Mathew Inwood
4d4f39980c Merge "Use non-logging compat framework calls" into sc-dev 2021-06-17 12:46:07 +00:00
Treehugger Robot
e92050f998 Merge "Add OWNERS for WM proto files" am: c14325dbdc am: 2bae704d44 am: 0eeb801d32
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: I5b2d9c0647bb7609ec3490fc848830174cbe942b
2021-06-17 12:04:45 +00:00
Treehugger Robot
0eeb801d32 Merge "Add OWNERS for WM proto files" am: c14325dbdc am: 2bae704d44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: I6cf39d9e11453615e2b11962ee86be15746c31f4
2021-06-17 11:52:00 +00:00
Automerger Merge Worker
9f66c6d658 Merge "Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d am: 598a69a010" into sc-v2-dev-plus-aosp 2021-06-17 11:34:40 +00:00
Pavel Grafov
8f60dc8738 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d am: 598a69a010
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: Ib19835e7777c84463f4e9b5c2f1e2f682e3a9540
2021-06-17 11:34:35 +00:00
Pavel Grafov
dc26adc8d4 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d am: 89af5adc32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: I76fc956eed1c56008b4b70693b9bea706c5f2dac
2021-06-17 11:34:34 +00:00
Treehugger Robot
2bae704d44 Merge "Add OWNERS for WM proto files" am: c14325dbdc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: Ie6b2b1971984c4b39f39f981030b59a67caf955b
2021-06-17 11:27:09 +00:00
Pavel Grafov
598a69a010 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: Iaa914228355a0ede419b63afdc844e62f0b65e62
2021-06-17 11:16:45 +00:00
Pavel Grafov
89af5adc32 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: Ib378a9ac45565ff1a82d6db7bd6e963a1a235ccc
2021-06-17 11:16:24 +00:00
Treehugger Robot
c14325dbdc Merge "Add OWNERS for WM proto files" 2021-06-17 11:09:39 +00:00
Pavel Grafov
6f5fe9271d Merge "More debug for security loggin broadcast" into sc-dev 2021-06-17 11:04:37 +00:00
Bram Bonné
fef87a600f Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d am: 1a482e6be6 am: 54592ead98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: I18d32426091f2a198df5d632d5f0d9509c38b49c
2021-06-17 10:43:47 +00:00
Bram Bonné
54592ead98 Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d am: 1a482e6be6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: Iffc3c6abbd6b215f530723c5dc420e368bb7eb2d
2021-06-17 10:25:53 +00:00
Bram Bonné
1a482e6be6 Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: Id64cca5d9eb784c28320f335c1c912be8da12847
2021-06-17 09:58:34 +00:00
Robin Lee
5033b844a7 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e am: e62779a673
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: Ie228ed2e45fc779d1e633631e436e3bbabd57ecf
2021-06-17 09:54:56 +00:00
Pedro Loureiro
0149616a62 [automerger skipped] Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 am: e7fc2de4db -s ours
am skip reason: Merged-In I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de with SHA-1 29365193de is already in history

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

Change-Id: I34d8b82c1fbd38d5f7f14a20eed81773c68cab74
2021-06-17 09:54:44 +00:00
Robin Lee
bafa8e9bc9 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e am: 1cf93a9d11
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: I72406cc132af1d2020ec8e5651009a61507b4ccf
2021-06-17 09:46:50 +00:00
Pedro Loureiro
f9ef640fa6 [automerger skipped] Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 -s ours am: 255c7ee3bc -s ours
am skip reason: Merged-In I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de with SHA-1 4f09b85b38 is already in history

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

Change-Id: Ibc3834a135dc7c4b7a85c3ce19bf1a9208550592
2021-06-17 09:46:42 +00:00
Bram Bonné
32d031336d Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" 2021-06-17 09:42:31 +00:00
Robin Lee
e62779a673 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: I2190061b00390c02b26da5debf659e8cba218b82
2021-06-17 09:38:36 +00:00
Pedro Loureiro
e7fc2de4db Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964833

Change-Id: If8f4fa456affcd57e6ba51b5894e284325d93fd9
2021-06-17 09:37:58 +00:00
Robin Lee
1cf93a9d11 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: I61cd8295d32795d7cd454a49040a7668510780ed
2021-06-17 09:36:46 +00:00
Pedro Loureiro
255c7ee3bc [automerger skipped] Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 -s ours
am skip reason: Merged-In I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de with SHA-1 4f09b85b38 is already in history

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

Change-Id: I6d6e1be77c248c3bb01130a79b93db203bb74844
2021-06-17 09:36:05 +00:00
Robin Lee
8766e5c15e Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev 2021-06-17 09:30:28 +00:00
Pedro Loureiro
2ae1e25b80 Merge "Run bpfmt on api/Android.bp" into sc-dev 2021-06-17 09:19:38 +00:00
Charles Chen
d74a3afec9 Add OWNERS for WM proto files
Bug: 190684677
Test: upload check
Change-Id: Iba1516bc1fb23ac8bf3126c42350b8ea82bfe62b
2021-06-17 16:57:30 +08:00
Riddle Hsu
a74b169a84 Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev am: 5b24daa483 am: f6af926483
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963622

Change-Id: I6f20415d13874631d9253a39b862c944d49c925d
2021-06-17 07:34:40 +00:00