Fix GMS core crash loop
Gmscore relies on the fact on the specific makePathElements
method and crashes if it does not exist. This change works
around the problem by defining method needed by gmscore.
Bug: http://b/21957414
Change-Id: I4c3c34c279e06b0cc5249062728864c939d3ecda
diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/dalvik/src/main/java/dalvik/system/DexPathList.java
index f0b1ffd..5552b1c 100644
--- a/dalvik/src/main/java/dalvik/system/DexPathList.java
+++ b/dalvik/src/main/java/dalvik/system/DexPathList.java
@@ -224,6 +224,15 @@
return makeElements(files, null, suppressedExceptions, true);
}
+ /*
+ * TODO (dimitry): Revert after GMS core stops relying on the existence of this
+ * method (see b/21957414 for details)
+ */
+ private static Element[] makePathElements(List<File> files, File optimizedDirectory,
+ List<IOException> suppressedExceptions) {
+ return makeElements(files, null, suppressedExceptions, true);
+ }
+
private static Element[] makeElements(List<File> files, File optimizedDirectory,
List<IOException> suppressedExceptions,
boolean ignoreDexFiles) {
