Remove DexIO.getDexPoolOverflow

DexPatcher · Sep 13, 2018 · 341f706 · 341f706
1 parent adc133c
commit 341f706
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/java/lanchon/multidexlib2/DexIO.java b/src/main/java/lanchon/multidexlib2/DexIO.java
@@ -55,7 +55,7 @@ static void writeRawDexSingleThread(DexDataStore dataStore, DexFile dexFile, int
 		while (classIterator.hasNext()) {
 			ClassDef classDef = classIterator.next();
 			dexPool.internClass(classDef);
-			if (getDexPoolOverflow(dexPool, maxDexPoolSize)) {
+			if (dexPool.hasOverflowed(maxDexPoolSize)) {
 				handleDexPoolOverflow(classDef, classCount, classes.size());
 				throw new AssertionError("unexpected type count");
 			}
@@ -139,7 +139,7 @@ private static void writeMultiDexDirectoryCommon(File directory, DexFileNameIter
 				ClassDef classDef = classIterator.peek();
 				dexPool.mark();
 				dexPool.internClass(classDef);
-				if (getDexPoolOverflow(dexPool, maxDexPoolSize)) {
+				if (dexPool.hasOverflowed(maxDexPoolSize)) {
 					handleDexPoolOverflow(classDef, fileClassCount, minMainDexClassCount);
 					dexPool.reset();
 					break;
@@ -160,10 +160,6 @@ private static void writeMultiDexDirectoryCommon(File directory, DexFileNameIter
 		} while (classIterator.hasNext());
 	}
 
-	private static boolean getDexPoolOverflow(DexPool dexPool, int maxDexPoolSize) {
-		return dexPool.hasOverflowed(maxDexPoolSize);
-	}
-
 	private static void handleDexPoolOverflow(ClassDef classDef, int classCount, int minClassCount) {
 		if (classCount < minClassCount) throw new DexPoolOverflowException(
 				"Dex pool overflowed while writing type " + (classCount + 1) + " of " + minClassCount);