- Aug 03, 2023
-
-
Sherry Zhou authored
-
Azwa Bajwah authored
-
Shivangi Dubey authored
-
Jernej Virag authored
-
Riddle Hsu authored
-
Naomi Musgrave authored
[automerger skipped] Merge "[MediaProjection] Address deadlock between multiple services" into udc-dev am: 607bd36f am: 91660e8b -s ours am skip reason: Merged-In I9c21acf069c66f1ade22c49b095ad5339fe13eca with SHA-1 e871b1f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24150805 Change-Id: I18710aa71008faa3bb44500773d48f59ac554701 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Nicolò Mazzucato authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24281855 Change-Id: If3c0c5d36c172eec81957843c042d8039105618b Signed-off-by:
-
Matías Hernández authored
* Fix coverage. Because createAlertingNotificationManager() was not correctly overriden (broken in ag/16852731) the unit tests declared on the base class (AlertingNotificationManagerTest) were _not_ using the appropriate SUT in the descendant test classes. * Make testExtendHeadsUp() faster by resource-overriding the mExtensionTime with a much shorter value than its actual one of 10 seconds. * Minor formatting/style issues. Test: atest AlertingNotificationManagerTest HeadsUpManagerTest HeadsUpManagerPhoneTest Fixes: 294042016 Change-Id: Ia7fa536b8eb9886c645d06aac85e5d9264ceb86d
-
Matías Hernández authored
-
Nick Chameyev authored
-
Naomi Musgrave authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24150805 Change-Id: Ica8bce8d13c5c1b71c6e3ba1ff982f18469d8321 Signed-off-by:
-
Nicolò Mazzucato authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24281855 Change-Id: Id6d2f4c5dff23cab77a41c31c6f85973978619fa Signed-off-by:
-
Naomi Musgrave authored
-
Nicolò Mazzucato authored
-
Riddle Hsu authored
To reduce latency of physical display switch. Bug: 266197298 Bug: 293131586 Bug: 292472402 Test: Check latency of fold/unfold. Change-Id: Id2e796edee45dae281f867c2b1549a80984c8a8e (cherry picked from commit 5dfc7882)
-
Graciela Putri authored
-
Treehugger Robot authored
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 93473610 -s ours am: 50eda5e3 -s ours am: 7f74bcb5 -s ours am: c130a29b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I89d9d29c3dceb229e8e409dbd62922c6c5695fbf Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 1056c3ab -s ours am: 40014cda -s ours am: 5b7202a3 -s ours am: 06cc092a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ie6d0ab884bf7291fc8dbf453c5e18e92bec3fd64 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 501cddc9 -s ours am: 42fd03e7 -s ours am: 7499a939 -s ours am: 475ef3e2 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I88bd6a31f19a870095de8888aff0460c847c1b8b Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: 06b24f00 -s ours am: 43a466ec -s ours am: fc4530d6 -s ours am: 7ffebb22 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I09267d654fd8a670b2f936a6665a1f98d0f9ee6f Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 0713b8ce -s ours am: d80debe6 -s ours am: 30aabba4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I3fd9eff933d0d778a4a4a27c982e533337de849b Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 2c6bc42d -s ours am: d6f987ec -s ours am: 1c09e77d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I0f8dc5f12dfbf2e014ff023ef00e2bf3f304cf33 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 4e330903 -s ours am: 0425b69c -s ours am: e6e5a7f5 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I3104a4a73d481a7c89e4338aa664692bb804c663 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: c06cecce -s ours am: 699fac4a -s ours am: 9720f59e -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I54b727920ea20c0e49a240b8234efcc1db75b83b Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 93473610 -s ours am: 50eda5e3 -s ours am: 7f74bcb5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ie36c496b39b9ad2344ecceb1f4bc1c88de2e4a39 Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 1056c3ab -s ours am: 40014cda -s ours am: 5b7202a3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I1ef113bc1e6e640a5e7fb5af71051ae23360bc28 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 501cddc9 -s ours am: 42fd03e7 -s ours am: 7499a939 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I5f36d65ac7c7eafa84def160eac40385c5cf7bc3 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: 06b24f00 -s ours am: 43a466ec -s ours am: fc4530d6 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: If64741aa10068e122a4c0f4ddd3bc8738fdd32a4 Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 93473610 -s ours am: 50eda5e3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ie3711fefc92af60c21b9549c11653de9546c6f3b Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 1056c3ab -s ours am: 40014cda -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I5885271cdb06951675d8149e82bc1b1650ab837f Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 501cddc9 -s ours am: 42fd03e7 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I7451095612aa451e7090ed42476eec77f662f9b7 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: 06b24f00 -s ours am: 43a466ec -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I5bf40a425cde2ed69aebee5b93c2b92fc8adce94 Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 0713b8ce -s ours am: d80debe6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ia5ebc79d377c963d0e9f3a1138dc9db5a66a4ec3 Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 2c6bc42d -s ours am: d6f987ec -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I91f9cd5b32cfebbaa2e23ebb5c463f9869cb4a36 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 4e330903 -s ours am: 0425b69c -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I9e912dcd220a6bb967ad206444e9f1672a9af62e Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: c06cecce -s ours am: 699fac4a -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I6fe9403669fdb334dc600178f4ab71b279b79057 Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 0713b8ce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Id1f19df175389204a05a2ad9dc18da3d70f0d1f2 Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 2c6bc42d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ie9edda69f061bf1d82dc13b4449c826243b5646e Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 4e330903 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I6c600ff65a300a04453573a05b97bdb0f8848217 Signed-off-by:
-
