Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
767,457 Commits 3 Branches 0 Tags
7c18952bdb2cd25835a8bb7062efda5cf24c67ca
Commit Graph

767457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
7c18952bdb Merge changes from topic "AppExclusion" am: 7b6fa7c457 am: 3350cb96a3 am: 7b0f3d0f11 am: 3bd980cb99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076559

Change-Id: Id7f1de1e416bdfe1f8aca1868d0c14ebaa71b6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:38:53 +00:00
Benedict Wong
884ba5833e Add to/from disk stable format am: 823599b4a8 am: 2e5b004421 am: 7f201bc8b5 am: 5f1d82189c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084734

Change-Id: I76961bd861e27e1502d4709e79a05ab58cb72d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:38:47 +00:00
Treehugger Robot
d28e148bd9 Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d am: ea4f257004 am: e0ceb9de72 am: 9fa6409399 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081684

Change-Id: Ie6e85c998b8aee1a05b0ddec7d88de7d5a56e419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:38:21 +00:00
TreeHugger Robot
405dde599b Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23cb2 am: 95b6745094 am: 748270e7ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144357

Change-Id: I65e92ed8e3a3afe539c3090a03e11fc53f6ad36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:37:40 +00:00
TreeHugger Robot
c552564931 Merge "Remove inSplitScreen function" into tm-dev am: 76ebae0c6c am: 474272ef89 am: bb7212cdd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976183

Change-Id: Id7653d4e37cdacf90cf1a0412807815ec191d641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:37:30 +00:00
TreeHugger Robot
5789ab23ff Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23cb2 am: d44c155714 am: 0273ea2167 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144357

Change-Id: Id426490e8a3306ba650e29bca792b7649a3a91f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:36:46 +00:00
Automerger Merge Worker
b298744be8 Merge "Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 am: b90703111f" into tm-d1-dev-plus-aosp am: f770f422ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226

Change-Id: I050ba40b7883aff527b5d022f57873ed7fbd30d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:36:29 +00:00
TreeHugger Robot
5e84a35483 Merge "Remove inSplitScreen function" into tm-dev am: 76ebae0c6c am: 30a5aa00f9 am: f1e8478cd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976183

Change-Id: If1f92a4c136733c88868ffbdf63c7d580be37a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:35:52 +00:00
Joanne Chung
42f24e6959 Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 am: 5cdd3ce880 am: cdf11f043a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226

Change-Id: Ib869ff43e0cf9aaf44a4593b40422d4ed973ed26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:35:23 +00:00
Chiachang Wang
3bd980cb99 Merge changes from topic "AppExclusion" am: 7b6fa7c457 am: 3350cb96a3 am: 7b0f3d0f11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076559

Change-Id: I1c3b0c749c4ab347064514199f3552544cad85eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:21:15 +00:00
Benedict Wong
5f1d82189c Add to/from disk stable format am: 823599b4a8 am: 2e5b004421 am: 7f201bc8b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084734

Change-Id: Ib674c0a037d33683c9aeb7c062e336f7571046d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:21:11 +00:00
Treehugger Robot
9fa6409399 Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d am: ea4f257004 am: e0ceb9de72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081684

Change-Id: I670700a285199b58775b77045997e76c755027db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:20:49 +00:00
TreeHugger Robot
748270e7ef Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23cb2 am: 95b6745094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144357

Change-Id: Iced79dac59e34d9dbb25ee2ccdc44dae5daf5589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:20:30 +00:00
Chiachang Wang
7b0f3d0f11 Merge changes from topic "AppExclusion" am: 7b6fa7c457 am: 3350cb96a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076559

Change-Id: Ic5cb43ee4e4c32c2372b78605403ba57afb89b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:20:22 +00:00
TreeHugger Robot
bb7212cdd9 Merge "Remove inSplitScreen function" into tm-dev am: 76ebae0c6c am: 474272ef89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976183

Change-Id: Icb798d48c74a107c63ce9619141ca87fc8df4804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:20:06 +00:00
Benedict Wong
7f201bc8b5 Add to/from disk stable format am: 823599b4a8 am: 2e5b004421 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084734

Change-Id: Id0c89247191fe03425e3e225281d4c6a5c3e6126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:20:04 +00:00
TreeHugger Robot
0273ea2167 Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23cb2 am: d44c155714 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144357

Change-Id: Iee3d92e73cb08704944491ffa9426b65627f4ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:59 +00:00
Automerger Merge Worker
f770f422ad Merge "Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 am: b90703111f" into tm-d1-dev-plus-aosp 2022-05-05 02:19:51 +00:00
TreeHugger Robot
f1e8478cd9 Merge "Remove inSplitScreen function" into tm-dev am: 76ebae0c6c am: 30a5aa00f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976183

Change-Id: I570b184203cf6215e4408c5d0c28154a2c0ed857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:42 +00:00
Joanne Chung
176e40e588 Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 am: b90703111f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226

Change-Id: Icc89782516e4c0b81ab46e2249125f11bede5dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:42 +00:00
Chiachang Wang
3350cb96a3 Merge changes from topic "AppExclusion" am: 7b6fa7c457 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076559

Change-Id: I85b1ee3b6e2724f33a9e541527cc377ffb838013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:27 +00:00
Benedict Wong
2e5b004421 Add to/from disk stable format am: 823599b4a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084734

Change-Id: Ia99f0b3c98bec204526f10d00b0b4db1431e6a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:25 +00:00
Joanne Chung
cdf11f043a Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 am: 5cdd3ce880 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226

Change-Id: Idb5a8f206355140f44c1d52185b7ee223fbde4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:24 +00:00
Treehugger Robot
e0ceb9de72 Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d am: ea4f257004 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081684

Change-Id: I5f93d5daaaf09eb1d1a257df44bb2781828b734d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:17 +00:00
Chiachang Wang
7b6fa7c457 Merge changes from topic "AppExclusion" 
* changes:
  Allow getting/setting app exclusion list for specific vpn profile
  Add to/from disk stable format
 2022-05-05 01:58:49 +00:00
TreeHugger Robot
d44c155714 Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144357

Change-Id: I5e8beec7447acc85b858180dc68577d52b30dcd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:55:16 +00:00
TreeHugger Robot
30a5aa00f9 Merge "Remove inSplitScreen function" into tm-dev am: 76ebae0c6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976183

Change-Id: Iad473564192c9ff41e96c2918fb03e12cf7e0e22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:53:56 +00:00
Joanne Chung
5cdd3ce880 Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226

Change-Id: Ibf877ddcfac019664095bf47ca6a9ae5611028c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:52:47 +00:00
TreeHugger Robot
95b6745094 Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144357

Change-Id: If564d5ab86b0e36aea0c04d853a6d6d35c2a2499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:52:42 +00:00
TreeHugger Robot
474272ef89 Merge "Remove inSplitScreen function" into tm-dev am: 76ebae0c6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976183

Change-Id: Ib451e6bc1d3efb8743725f9e59753e8ebcb8b6c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:52:20 +00:00
TreeHugger Robot
dc25f23cb2 Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev 2022-05-05 01:51:54 +00:00
Treehugger Robot
ea4f257004 Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081684

Change-Id: I1cb22ce69e434c15e0324a5526d00478cf0c1850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:51:52 +00:00
Joanne Chung
b90703111f Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev am: 5ab99b0a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156226

Change-Id: Id8a1d8e906390f54f4fdd856762c616b885dbafc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:51:21 +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
TreeHugger Robot
76ebae0c6c Merge "Remove inSplitScreen function" into tm-dev 2022-05-05 01:36:38 +00:00
Treehugger Robot
87e124332d Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" 2022-05-05 01:24:44 +00:00
Joanne Chung
5ab99b0a21 Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev 2022-05-05 01:17:42 +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