diff options
| author | Jiyong Park <jiyong@google.com> | 2018-04-05 16:12:39 +0900 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-11-10 23:57:38 +0100 |
| commit | 991d2321e064111f5f7c20dda675beb4b042103d (patch) | |
| tree | 41dd4a6581ebaf593710004fe788a4d43368c1a3 /jarjar-rules.txt | |
| parent | 6511d765327913deaf8e1ede59370aedb70a867f (diff) | |
| download | android_packages_apps_Gallery2-991d2321e064111f5f7c20dda675beb4b042103d.tar.gz android_packages_apps_Gallery2-991d2321e064111f5f7c20dda675beb4b042103d.tar.bz2 android_packages_apps_Gallery2-991d2321e064111f5f7c20dda675beb4b042103d.zip | |
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
Diffstat (limited to 'jarjar-rules.txt')
| -rw-r--r-- | jarjar-rules.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jarjar-rules.txt b/jarjar-rules.txt new file mode 100644 index 000000000..99555e465 --- /dev/null +++ b/jarjar-rules.txt @@ -0,0 +1 @@ +rule android.util.Pools** com.android.photos.util.Pools@1 |