- Oct 06, 2023
-
-
Weilin Xu authored
Fixed the race condition between receiving onCurrentProgramInfoChanged callback and update mocking isCurrentOrSystemUser method called from onCurrentProgramInfoChanged in cancel_forNonCurrentUser for both AIDL and HIDL HAL broadcast radio service tuner session unit test, which causes test flakiness. Also fixed the way for mockito checking for a method never called within in a timeout period in unit test. Safer doReturn and doThrow Mockito syntax are also used. Bug: 302236983 Test: atest com.android.server.broadcastradio Change-Id: I163b7e3b020aa6df33355a3fc4dff9af76976ff8
-
- Sep 29, 2023
-
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff5 -s ours am: 2058e088 -s ours am: 8e3b54f8 -s ours am: 595ecc5e -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: Ic5ebf4b0f5b0c9ee1f50181783f92b980e4eb558 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Anvesh Renikindi authored
[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c3337 -s ours am: c607a8d9 -s ours am: f8374721 -s ours am: e0fef8e0 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: Ief3f57c1d10256cfad973f19b8bf5cb3d61e1c8d Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am: 876446b1 -s ours am: 8b2d61eb -s ours am: a2b9f65a -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: I72c0a8f815d08b21105b3655fd78f6ea6ff55960 Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: 8d59a527 -s ours am: 0b9294f5 -s ours am: 3eb66b1a -s ours am: df77ba59 -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: I78bc6cf4e5e6254c8a6eb52f7e03614f162c6af6 Signed-off-by:
-
Anvesh Renikindi authored
Merge "Move page count to rememberPagerState" into aosp-main-future am: e8a2bcbd am: f3decd99 am: 7317c15e am: 135574e2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860151 Change-Id: Ie36bda669aa8fdd3bdc5f56408c2889a815703aa Signed-off-by:
-
Winson Chung authored
* changes: Revert "Add shell command to reset the frozen task state" Revert "Extend unfreeze recents duration when running under tests"
-
Justin Weir authored
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff5 -s ours am: 2058e088 -s ours am: 8e3b54f8 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: I0a7f8bea05ef93af5f60471df19143755208941f Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c3337 -s ours am: c607a8d9 -s ours am: f8374721 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: I3f68a4b247d30aac9c440a1d6875711e179af2e1 Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am: 876446b1 -s ours am: 8b2d61eb -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: I1db900c4e230ee5b58b1a50e68556f38f488bdd3 Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: 8d59a527 -s ours am: 0b9294f5 -s ours am: 3eb66b1a -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: Icde87f5c15f8e4033c07af48e5dc1aee5dc5ebd4 Signed-off-by:
-
Anvesh Renikindi authored
Merge "Move page count to rememberPagerState" into aosp-main-future am: e8a2bcbd am: f3decd99 am: 7317c15e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860151 Change-Id: I20f16eea0f44b5f6fbd94b818bb7cfcee4bce6ac Signed-off-by:
-
Ling Ma authored
-
Brad Hinegardner authored
[automerger skipped] Merge "Move shortcut falsing shake and vibration to onclicklistener" into udc-qpr-dev am: 7adeffd9 am: ebd0bbe4 -s ours am skip reason: Merged-In I2e09718bb2d70983275d0b3e214b344c13f9843b with SHA-1 6c054354 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24875873 Change-Id: I065dce913c42a6e05e5406e478de4026adb6a85c Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff5 -s ours am: 2058e088 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: I353c13d65face71cad9d21d3c4e89bc87c04e2e9 Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c3337 -s ours am: c607a8d9 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: If886be90908cf8f90ac6ae45df066e18a84e0e23 Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am: 876446b1 -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: I680501cc3ac6d04e6cef409d29e24a7287f5f298 Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: 8d59a527 -s ours am: 0b9294f5 -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: Iddf1ebe60ac6f062731c01c0006c031b46fc74d6 Signed-off-by:
-
Anvesh Renikindi authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860151 Change-Id: Ic9a780ce121873cbef41b7f371c5b08d115fedff Signed-off-by:
-
Mark White authored
Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091 am: ea26d808 am: 08ae7288 am: ac2a84f7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388 Change-Id: I6acd7a0b469f004b1ecb3de99f4fc3b09d98ebc5 Signed-off-by:
-
Mady Mellor authored
-
Winson Chung authored
Revert submission 24866277-recents_freeze_tests Reason for revert: b/302267317 Reverted changes: /q/submissionid:24866277-recents_freeze_tests Change-Id: Ia13dadc0d217539ab2cbfb8a235ae8503942def8
-
Winson Chung authored
Revert submission 24866277-recents_freeze_tests Reason for revert: b/302267317 Reverted changes: /q/submissionid:24866277-recents_freeze_tests Change-Id: I5b45bb157fe79467ad4da0998ea43e2caf637a5e
-
Vadim Caen authored
-
Oleg Petšjonkin authored
-
Treehugger Robot authored
-
Sunny Goyal authored
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff5 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: I9fc86b0c7010f54ee51a98aa17bccf55027e7812 Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c3337 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: I14bff46034aa0d5d1fda4763b445d2fb55bad83c Signed-off-by:
-
Anvesh Renikindi authored
[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: Id501e359f05cc551669b8ba816467eef622b07d6 Signed-off-by:
-
Anvesh Renikindi authored
am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: Ie63e3119194b0b772fbb2e72ed217a4bd89f0d0c Signed-off-by:
-
Anvesh Renikindi authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860151 Change-Id: I1c81b0b23a7ccf64031bc77e475acb50cd81ce53 Signed-off-by:
-
Brad Hinegardner authored
Merge "Move shortcut falsing shake and vibration to onclicklistener" into udc-qpr-dev am: 7adeffd9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24875873 Change-Id: I038184aa73266dcc6b62788ce79eed044fd3f456 Signed-off-by:
-
Julia Reynolds authored
-
Mark White authored
Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091 am: ea26d808 am: 08ae7288 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388 Change-Id: Icc39f8b5b7353cc3057c04e69dd9620dd3d946a0 Signed-off-by:
-
Caitlin Shkuratov authored
* changes: [CS] 5/ Move status bar mode & appearance to repository. [CS] 4/ Small updates to LetterboxAppearanceCalculator APIs.
-
Caitlin Shkuratov authored
-
Erik Staats authored
This reverts commit 8ecc679d. Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=cf_x86_64_auto-next-userdebug&lkgb=10881379&lkbb=10881575&fkbb=10881450 , bug b/302695414 . Bug: 302695414 Change-Id: I6d2e402b69fbb4b828909cb184745710346ac473
-
John Wu authored
-
