Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
785,208 Commits 3 Branches 0 Tags
acb882dda8143a2f6ae63dcd9bd5529c19f76d9f
Commit Graph

785208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
acb882dda8 Merge "Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 24d22c1bb5 am: 80b3d2834a" into tm-qpr-dev-plus-aosp am: eb3eaee3e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: I777873efadc9b5ca76f5f9b64b40cfd0e1175691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:05:38 +00:00
Riddle Hsu
74fe9dc64a Merge "Still request sync draw if the window is not in sync group" into tm-qpr-dev am: e6c0cb83ce am: 15ea925dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157292

Change-Id: Idfcde2ebfe4c5877283801ddd6ce0d87b0b3636d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:04:35 +00:00
Songchun Fan
a1affd9b1a Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 2fca7f7381 am: 4a207f9690 am: cdd5c24054 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: I35c47812d7caa0a4a43121e9e18dde978eb565a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:03:50 +00:00
TreeHugger Robot
96df74dfef Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: 1b4735ab6e am: 78125567ed am: 6f88660f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628

Change-Id: I52d2e53f4d4fae82df4b0572fd883caa147e5fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:00:47 +00:00
Jing Ji
ab680a104a Merge "Add a new binding flag BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE" into tm-dev am: 8094df8ba3 am: 6a4d2e410b am: c0469d6231 am: f215457886 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108533

Change-Id: I47c1ffd0b359cf6f1bcade247171dcd16e714406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:00:11 +00:00
Ilya Matyukhin
e52949f2b6 [automerger skipped] Merge "Respect halControlsIllumination provided by the HAL" into tm-dev am: de84e3f019 -s ours am: 0ee938effc -s ours am: 9980e0350b -s ours am: 0ec6285c47 -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: Idae213cc22beefd17d304c906cc34c6008607ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:59:44 +00:00
Ilya Matyukhin
13dc62bbfd [automerger skipped] Respect halControlsIllumination provided by the HAL am: 59d49a4238 -s ours am: 92ae2eae7e -s ours am: f92571eb24 -s ours am: 4f3b653361 -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: I64f0a313de0ac6f50a813093cded5cdab98d9dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:59:30 +00:00
Shuzhen Wang
8da801a609 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd am: f662a50fb4 am: bc065602a4 am: 485ab61b33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: Ib7986ab58833513f24bb3e18dbd4de6b2fd06344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:58:43 +00:00
Mateusz Cicheński
56011a01f3 Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: dd74651995 am: 085c037c1a am: 64921c112e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I7d4524dc7112ea526a16f9740df7a336fbcb857e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:58:03 +00:00
TreeHugger Robot
1778165e85 Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: f8f04fa5a3 am: 37a9a170e7 am: 0473d92e72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628

Change-Id: I160ea802c3e0bc254ac4f54636d4813089ab226e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:57:11 +00:00
Songchun Fan
be7d2ce6d7 Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 2fca7f7381 am: 595d4078a3 am: 72288a0693 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: Ie3d7457c3196f7cbfff557b62ecb9132bccc7e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:56:22 +00:00
TreeHugger Robot
a573ea082f Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: 1b4735ab6e am: 22f2f57373 am: 1e32fd6fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628

Change-Id: If83edc58d7db10aa0bbb22fd34e537d4bbb36d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:54:22 +00:00
Automerger Merge Worker
12e76d2bec Merge "Merge "Add a new binding flag BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE" into tm-dev am: 8094df8ba3 am: 800258c060" into tm-d1-dev-plus-aosp am: d0383551d0 am: 708342afd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108533

Change-Id: I301afe96f77b96ce8521dd049daa3ab0875a39d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:53:35 +00:00
Jing Ji
f56f981819 Merge "Add a new binding flag BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE" into tm-dev am: 8094df8ba3 am: 6a4d2e410b am: 782857332f am: 4e47325a04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108533

Change-Id: I676fbe6617c419ebd5129dbb57341617d8ae3377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:52:52 +00:00
Automerger Merge Worker
d86d11cffd [automerger skipped] Merge changes from topic "am-9d4fd6e2855d475da7dcbb537d2bf1ba" into tm-d1-dev-plus-aosp am: d2ff4985e1 -s ours am: e32cd0cf11 -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 59d49a4238 is already in history

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

Change-Id: I490e2e2d6425bab9e2bd4fb506e3b9150a5fe98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:51:59 +00:00
Ilya Matyukhin
8d55104bee [automerger skipped] Merge "Respect halControlsIllumination provided by the HAL" into tm-dev am: de84e3f019 -s ours am: 0ee938effc -s ours am: 8734fdc1c0 -s ours am: 83f8a4d21f -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: Ice70c4c1a932e9f8a4c3905b377a60c60621c0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:51:36 +00:00
Ilya Matyukhin
0a6b9a9236 [automerger skipped] Merge "Respect halControlsIllumination provided by the HAL" into tm-dev am: de84e3f019 am: 44227c06c2 -s ours am: 956cb5b63e -s ours am: 4d534e1d71 -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: Ib257033d5f98deec988a7cba85c8113b1b23cfc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:50:24 +00:00
Shuzhen Wang
bcbb263990 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd am: 7f765327f5 am: 2d7fa5b408 am: 4bf8656504 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: Ic4c5e3d8dd62059ae8fd3f83864946955b6aea28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:49:38 +00:00
Shuzhen Wang
49aec118b6 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd am: f662a50fb4 am: 5b87cbc640 am: fc534a77f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: Ifbbb360ef0cbd6dc3778e4789be529178f23aea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:48:50 +00:00
Automerger Merge Worker
9cfb8a59ea Merge "Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: dd74651995" into tm-d1-dev-plus-aosp am: fce8ecb270 am: 34edc22518 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I2a38459f94c54b1d121ecb1cb63fc3c8bd9417e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:48:05 +00:00
Mateusz Cicheński
a1eba64efc Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: 56375b707c am: a9c3f08998 am: 8d6e03df0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I208389269798c67847c81e88dcabb781dfc74aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:47:14 +00:00
Automerger Merge Worker
eb3eaee3e4 Merge "Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 24d22c1bb5 am: 80b3d2834a" into tm-qpr-dev-plus-aosp 2022-05-05 01:44:21 +00:00
Songchun Fan
570a1b35d1 Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 24d22c1bb5 am: 80b3d2834a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: I7e11d0558a7539b0f47a30547d28c38ad3e598c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:43:42 +00:00
Riddle Hsu
15ea925dac Merge "Still request sync draw if the window is not in sync group" into tm-qpr-dev am: e6c0cb83ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157292

Change-Id: Ie4783d43d77aedcf53e5044152fc38180d5cd718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:43:07 +00:00
Chun-Wei Wang
60fa4a065a Merge "Add help text for the --factory-only option" 2022-05-05 01:29:46 +00:00
Riddle Hsu
e6c0cb83ce Merge "Still request sync draw if the window is not in sync group" into tm-qpr-dev 2022-05-05 01:12:55 +00:00
Songchun Fan
cdd5c24054 Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 2fca7f7381 am: 4a207f9690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: I0adc2dfc60256e6b743a5c00eaea2f327e588545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:03:32 +00:00
TreeHugger Robot
6f88660f3a Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: 1b4735ab6e am: 78125567ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628

Change-Id: I523d92a6e2ba983e404f07539c9be9da7bf5c304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:57:50 +00:00
Jing Ji
f215457886 Merge "Add a new binding flag BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE" into tm-dev am: 8094df8ba3 am: 6a4d2e410b am: c0469d6231 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108533

Change-Id: If8edbb49a16653bfc7f90198a7725eee6b59e488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:57:26 +00:00
Ilya Matyukhin
0ec6285c47 [automerger skipped] Merge "Respect halControlsIllumination provided by the HAL" into tm-dev am: de84e3f019 -s ours am: 0ee938effc -s ours am: 9980e0350b -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: Ifb6ce60b81e049c6d7f13108d8acf8feb9fb0276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:57:06 +00:00
Ilya Matyukhin
4f3b653361 [automerger skipped] Respect halControlsIllumination provided by the HAL am: 59d49a4238 -s ours am: 92ae2eae7e -s ours am: f92571eb24 -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: Ic21de74d9657198e5feac157e838a070e312418c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:57:02 +00:00
Songchun Fan
80b3d2834a Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 24d22c1bb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: Ib39b5d4c35be4343487f95bcb74707422b54a84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:56:54 +00:00
Shuzhen Wang
485ab61b33 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd am: f662a50fb4 am: bc065602a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: If83ba7c8e555630fd239068d91534a7f9b4c1a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:56:35 +00:00
Mateusz Cicheński
64921c112e Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: dd74651995 am: 085c037c1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I55c3bf7ee8433acd18e28e86bbeab570a8539d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:56:10 +00:00
TreeHugger Robot
0473d92e72 Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: f8f04fa5a3 am: 37a9a170e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628

Change-Id: I57eb07f3cca2886198b94f193d79ef94db7a7135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:56:02 +00:00
Songchun Fan
72288a0693 Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 2fca7f7381 am: 595d4078a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: Iefaf4176fe678480a5db786724dc7f3153269297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:55:41 +00:00
TreeHugger Robot
1e32fd6fbb Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: 1b4735ab6e am: 22f2f57373 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628

Change-Id: I0ab77e61cc64611b2d8d477a7330a7b55591dc9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:54:45 +00:00
Automerger Merge Worker
708342afd4 Merge "Merge "Add a new binding flag BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE" into tm-dev am: 8094df8ba3 am: 800258c060" into tm-d1-dev-plus-aosp am: d0383551d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108533

Change-Id: I50a09c0870d54cda8a4607389f6e98b0b37eef83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:54:13 +00:00
Jing Ji
4e47325a04 Merge "Add a new binding flag BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE" into tm-dev am: 8094df8ba3 am: 6a4d2e410b am: 782857332f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108533

Change-Id: I76445177195bbc6cdd5a884e1c3627dd3906eb57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:53:25 +00:00
Automerger Merge Worker
e32cd0cf11 Merge changes from topic "am-9d4fd6e2855d475da7dcbb537d2bf1ba" into tm-d1-dev-plus-aosp am: d2ff4985e1 -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 59d49a4238 is already in history

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

Change-Id: I09b20e1a9609dd46371c48a819c3dded2d641855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:53:06 +00:00
Ilya Matyukhin
83f8a4d21f [automerger skipped] Merge "Respect halControlsIllumination provided by the HAL" into tm-dev am: de84e3f019 -s ours am: 0ee938effc -s ours am: 8734fdc1c0 -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: Ic16bba6893645ce6a6f5c786685922fc40949cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:53:01 +00:00
Ilya Matyukhin
4d534e1d71 [automerger skipped] Merge "Respect halControlsIllumination provided by the HAL" into tm-dev am: de84e3f019 am: 44227c06c2 -s ours am: 956cb5b63e -s ours 
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae345362 is already in history

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

Change-Id: I461f3b7d70b7ba45854b93ceef9fcd74f136db7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:52:17 +00:00
Shuzhen Wang
4bf8656504 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd am: 7f765327f5 am: 2d7fa5b408 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: I843d5553c85b84d318ba321cf6a11cfb3112daae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:51:57 +00:00
Shuzhen Wang
fc534a77f7 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd am: f662a50fb4 am: 5b87cbc640 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: I944391d2cc0bbfe669bf28b3022f2983fe8908e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:51:21 +00:00
Automerger Merge Worker
34edc22518 Merge "Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: dd74651995" into tm-d1-dev-plus-aosp am: fce8ecb270 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I1c9de2db774b5ae297ad8ce90ac255f08e47a77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:50:49 +00:00
Mateusz Cicheński
8d6e03df0f Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd279d am: 56375b707c am: a9c3f08998 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104310

Change-Id: I5140a371c535382266ff958df4054e2c3d17f795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:49:45 +00:00
Songchun Fan
24d22c1bb5 Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: Ia7c28cb29c64918d1051ee3fe705b6973a803516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:48:27 +00:00
Songchun Fan
4a207f9690 Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev am: 998d86cac1 am: 2fca7f7381 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152915

Change-Id: I09aa46b345f871a5d35b7ceb6bc80e3d852198b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:47:18 +00:00
TreeHugger Robot
78125567ed Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: 1b4735ab6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628

Change-Id: I8972893a63f02108244f71982bc7b3c787f312a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:46:01 +00:00
Jing Ji
c0469d6231 Merge "Add a new binding flag BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE" into tm-dev am: 8094df8ba3 am: 6a4d2e410b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108533

Change-Id: Ifffa711a3012f42bf27359a38b92ccd0bb2cfcee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 00:45:08 +00:00