packages/apps/Gallery2
Revision | e9eeb27eb06d675a5290a56d5868f70995b52680 (tree) |
---|---|
Zeit | 2018-04-05 18:45:43 |
Autor | Jiyong Park <jiyong@goog...> |
Commiter | Jiyong Park |
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
@@ -39,6 +39,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags | ||
39 | 39 | |
40 | 40 | LOCAL_JAVA_LIBRARIES += org.apache.http.legacy |
41 | 41 | |
42 | +LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt | |
43 | + | |
42 | 44 | include $(BUILD_PACKAGE) |
43 | 45 | |
44 | 46 | ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) |
@@ -0,0 +1 @@ | ||
1 | +rule android.util.Pools** com.android.photos.util.Pools@1 |
@@ -84,5 +84,3 @@ | ||
84 | 84 | -keep class com.android.gallery3d.jpegstream.StreamUtils { *; } |
85 | 85 | |
86 | 86 | |
87 | -# TODO: remove or rename android.util.Pools.java from our source. | |
88 | --dontwarn android.util.Pools* |