Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
765,740 Commits 3 Branches 0 Tags
8ec0384b99064a7d0807318d04cf0aa5d416eb4e
Commit Graph

765740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
8ec0384b99 Merge "Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: 292467b899" into tm-d1-dev-plus-aosp am: f3c3ecf93b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I451cb9e07be566f38f15bbe7392f09599a326875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:34:48 +00:00
Automerger Merge Worker
c2562142ba Merge "Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: ef16aea550" into tm-d1-dev-plus-aosp am: e53a04080e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I41bbf4a2e4b379a28bbf2a0a34e196b0ba49c190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:33:03 +00:00
TreeHugger Robot
72c1bf5586 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f am: 2af89948d6 am: 8d776e8d6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I39d6c51fdf958763fada9bb5070556133dadb5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:32:04 +00:00
Automerger Merge Worker
f3c3ecf93b Merge "Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: 292467b899" into tm-d1-dev-plus-aosp 2022-05-03 20:08:47 +00:00
Automerger Merge Worker
e53a04080e Merge "Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: ef16aea550" into tm-d1-dev-plus-aosp 2022-05-03 20:08:46 +00:00
Matt Casey
da1fc2956f Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: 292467b899 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: Icb7072b3b3f8479379f29b84bc57c3faef8b1d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:08:43 +00:00
Matt Casey
211a67f42f Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: ef16aea550 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I8f86a6c857352a84829a90dad3a919282740ef08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:08:32 +00:00
TreeHugger Robot
8d776e8d6c Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f am: 2af89948d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I432ced84706a708f707c1219c29ff9b1e332cd62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:08:15 +00:00
Matt Casey
292467b899 Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I5b82196f46e3e5778c4f73caa834ac8cae39b814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:42:25 +00:00
TreeHugger Robot
4aa01fde5e Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f am: e02e8396f6 am: b1fe1c3035 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I75870ad2f5858e44539a81d883c3de2e955840e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:41:52 +00:00
TreeHugger Robot
2af89948d6 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I44032a20427646738540b228d7f67920fbdbcfa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:41:19 +00:00
Austin Borger
96ba919252 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 am: 2422ae8437 am: 7a71c463d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: Idbb549d722e42c653a3be95cb10b931f5d72c0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:40:14 +00:00
Automerger Merge Worker
24a56fee4e Merge "Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 am: a72482fa22" into tm-d1-dev-plus-aosp am: 8ae069b779 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: Ia68871933729a1693473866634f871219658ed97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:39:50 +00:00
Austin Borger
184f6d1d6c Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 am: 7b10b3ae7b am: d792f436b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: I1525535ee734b7e10422b1a936bb779ce960f40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:39:37 +00:00
TreeHugger Robot
4322751b86 Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 am: e58ada1ed0 am: 63c929a5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: Ie84b4f10928cb4a47e6e2a0107cd50b4c9d04de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:39:24 +00:00
Justin Weir
edecb79148 Added MediaData.active to the media carousel comparator am: 2e58b46209 am: 791e8b6094 am: ee3d78dc4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: Icf4ba574be09bfb18c86c96222530f287b80d440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:39:06 +00:00
Automerger Merge Worker
ddf7ef355c Merge "Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 775b8e222c" into tm-d1-dev-plus-aosp am: 5581abf8bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I4e54fc9824bb5110df2b9cff614c236b04e50bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:38:59 +00:00
Justin Weir
46927d21cd Added MediaData.active to the media carousel comparator am: 2e58b46209 am: d8cb6e61db am: a894decd1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: I39124c291a0d2115b7085761fefe206ac222a886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:38:37 +00:00
TreeHugger Robot
938001b663 Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 26f102cc02 am: d3e41913e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I1354df50b9dd60441602836226e1c99943b0b7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:38:22 +00:00
Mateusz Cicheński
60062deb00 Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f am: 6c19b582f1 am: 5af7332bf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: I696b74e6cf39e2e315e0cc61d64fbd99804e6884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:37:29 +00:00
TreeHugger Robot
b1fe1c3035 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f am: e02e8396f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I6e3cc948d648c0ddd0c22534099e975689815281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:37:23 +00:00
Matt Casey
ef16aea550 Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I611105f578388cb5b0324a24135e6138362f64fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:36:44 +00:00
TreeHugger Robot
e02e8396f6 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I45b476a8ea70d4cb5103d45c7e1f0b9cd1fd89b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:36:26 +00:00
Mateusz Cicheński
c7fc53d8bf Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f am: 00d9005bdd am: 7125d8f64f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: Ic468b2635a719d0872ce67b3086b25ee871ebc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:34:48 +00:00
Matt Casey
e46c50811b Merge "Style tweaks for resolver empty state." into tm-dev 2022-05-03 19:33:03 +00:00
TreeHugger Robot
0927574f3f Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev 2022-05-03 19:29:34 +00:00
Austin Borger
7a71c463d4 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 am: 2422ae8437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: Ie8d7d489c10b29412ad7ad6b54b876703e953742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:20:35 +00:00
Automerger Merge Worker
8ae069b779 Merge "Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 am: a72482fa22" into tm-d1-dev-plus-aosp 2022-05-03 19:20:29 +00:00
Austin Borger
d792f436b8 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 am: 7b10b3ae7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: Iccb7ecd711e0634195fd086f7be122405f86de6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:20:22 +00:00
TreeHugger Robot
fd415eba62 Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 am: a72482fa22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: If4368862f0e96c26b915d08f44c0ad69b3957a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:20:11 +00:00
TreeHugger Robot
63c929a5b3 Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 am: e58ada1ed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: Icda90de53c7fd46fddb4c9bc9cd1ef4902a10a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:20:08 +00:00
Austin Borger
7b10b3ae7b Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: I654d9ed30846409c6de90b11bcb0e76916388a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:20:05 +00:00
Justin Weir
ee3d78dc4c Added MediaData.active to the media carousel comparator am: 2e58b46209 am: 791e8b6094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: I6b2e52cb4a188269e3385a5ed77d0fcce4a84beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:59 +00:00
Automerger Merge Worker
5581abf8bd Merge "Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 775b8e222c" into tm-d1-dev-plus-aosp 2022-05-03 19:19:55 +00:00
TreeHugger Robot
8096a882fb Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 775b8e222c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I820061c388c468b4ff2115a03a28c272e0cb52ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:50 +00:00
Justin Weir
a894decd1d Added MediaData.active to the media carousel comparator am: 2e58b46209 am: d8cb6e61db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: I5c3f90a7f29da15f844fd53756f0cdd2dadeda02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:49 +00:00
TreeHugger Robot
d3e41913e8 Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 26f102cc02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I8f2456befee495738f15611a47e2d2b99f6172f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:41 +00:00
TreeHugger Robot
e58ada1ed0 Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: Ib6f46afd05a13db08f5c9b242e87284703d0e097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:38 +00:00
Mateusz Cicheński
5af7332bf7 Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f am: 6c19b582f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: Id56f1c097ae3998506194a3a3d4edf76d9294ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:22 +00:00
Justin Weir
d8cb6e61db Added MediaData.active to the media carousel comparator am: 2e58b46209 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: Ibc729b5a7d6cd9150cc67fc61603b99cb4284bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:18 +00:00
Austin Borger
2422ae8437 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: I882a4d56da4c58d919ad202abdf9edf37af77cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:08 +00:00
Mateusz Cicheński
7125d8f64f Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f am: 00d9005bdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: Ib367df5de6aefd428ec18a7adb710f96d419b57d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:04 +00:00
TreeHugger Robot
26f102cc02 Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I2fb8cc3c7e2e94184e725110a8444c72bfb460ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:17:33 +00:00
Austin Borger
e48afc4089 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev 2022-05-03 19:14:14 +00:00
Ahaan Ugale
840bb54c39 Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-qpr-dev am: f51a7392ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17920268

Change-Id: I195e9dc12245c13ac1ec7a6b016ae380065bafc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:59:06 +00:00
Ahaan Ugale
b329f81c8a RESTRICT AUTOMERGE Disable the Trusted Hotword requirement am: 2fd599b2bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17920268

Change-Id: Ibd94d7368ed779f0124f47faa07f3b4f7312e759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:58:55 +00:00
TreeHugger Robot
a72482fa22 Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: I116db663983a686aa14e000e9cc12b082dc92aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:57:32 +00:00
Nikita Ioffe
5051ce23fc [automerger skipped] Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" into tm-dev am: d6359a85af am: 89b8598db4 am: c85762e847 -s ours 
am skip reason: Merged-In I5d2270b8341c0405bf256c417acff4279c6b8754 with SHA-1 bd2af08bba is already in history

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

Change-Id: If013ecb5c8a475b2c079f24eb7463056717f4bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:56:51 +00:00
Jeff Sharkey
365a57b576 Merge "logcat test: add OWNERS file" into tm-dev am: c3fc843b63 am: fc6aaf801b am: b759da5e55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126283

Change-Id: Icb847c65d2767ec0107397ddc34a273846d1c665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:56:38 +00:00
Matt Casey
dd8f43a691 Merge "Convert Personal/Work tabs to rounded bubbles" into tm-dev am: 5e35dcd369 am: 5850ed9a6f am: c11ab5595e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090806

Change-Id: I76f7b64e08090346a2cecf78329d6c1702cc7372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:56:09 +00:00