Snap for 4706961 from 8d0074b5e5498afbad51b01df7f2e8eecd8d17ee to pi-release Change-Id: I239f40af9f299e2a688114eb46bea0967901cfd3
Rename android.utils.Pools to com.android.photos.util.Pools android.utils.Pools is a class copied from frameworks/base. It was copied because the framework one has been marked as @hide. This caused the class to be duplicated into the Gallery2 apk and the boot classpath. At run-time, the class from bootclasspath was used because the classloader tries to load a class from the parent class loader first. However, this combined with the recent activation of the kill-switch caused a runtime error. Working around the issue by renaming the class copied into the app so that it does not collide with the framework-defined one. Bug: 77544391 Test: build aosp_walleye. Take a video and see it via the Gallery2. The app does not crash. Change-Id: Ia0af4da84242044da2e0ab63e38df243d9769418
Snap for 4696032 from 915d04b422c527a094ebfb19b4795d353d4ceec7 to pi-release Change-Id: I28d928a2a05cf99692f95b6979f6dc37994503c8
Merge "Import translations. DO NOT MERGE" into pi-dev
Snap for 4693621 from bb9b24fdcb4008b4367c7d2ecc1f72eec8839b25 to pi-release Change-Id: Iba8b9d87e8f5c64389f2d60c0cc60a1d887e3c71
Merge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev
Revert "Revert "Move Gallery2 to androidx."" This reverts commit fac21a096afbe8eb517726cf4f9f093eade87ddc. We can reland this change now that prebuilts/sdk has been updated with the new SDK. (ag/3818779) Bug: 76692459 Change-Id: I73f2ed3d61bc8756d1b7e4ea0e54c58227d5d506
Merge "Revert "Move Gallery2 to androidx."" into pi-dev
Revert "Move Gallery2 to androidx." This reverts commit c86745dd27fb93baa1ec22796bb4af207b6b6182. Broke apps target build. Bug: 76692459 Change-Id: I7b3529a9584d72a31b6c16ff4d4155f75d1c57f8
Merge "Move Gallery2 to androidx." into pi-dev
Move Gallery2 to androidx. Bug: 76692459 Test: make -j Gallery2 and run on emulator Change-Id: Ife6a5649c21464f404db3198bd6a4ba8aa901ee8