Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill

(cherry picked from commit d2301a66b2629f2841ab3a3cc7684a645ebe7217)

Change-Id: I32522d86950d0c1a89e77b44ddeab071ce9c021a

1 files changed, 9 insertions, 6 deletions

diff --git a/dex/src/main/java/com/android/dex/Dex.java b/dex/src/main/java/com/android/dex/Dex.java
index 3fa5ab5..9ecd133 100644
--- a/dex/src/main/java/com/android/dex/Dex.java
+++ b/dex/src/main/java/com/android/dex/Dex.java
@@ -268,10 +268,6 @@ public final class Dex {
         return nextSectionStart;
     }
 
-    private static int fourByteAlign(int position) {
-        return (position + 3) & ~3;
-    }
-
     /**
      * Returns a copy of the the bytes of this dex.
      */
@@ -633,9 +629,16 @@ public final class Dex {
         }
 
         /**
-         * Writes 0x00 until the position is aligned to a multiple of 4.
+         * Skips bytes until the position is aligned to a multiple of 4.
          */
         public void alignToFourBytes() {
+            data.position((data.position() + 3) & ~3);
+        }
+
+        /**
+         * Writes 0x00 until the position is aligned to a multiple of 4.
+         */
+        public void alignToFourBytesWithZeroFill() {
             while ((data.position() & 3) != 0) {
                 data.put((byte) 0);
             }
@@ -710,7 +713,7 @@ public final class Dex {
             for (short type : types) {
                 writeShort(type);
             }
-            alignToFourBytes();
+            alignToFourBytesWithZeroFill();
         }
 
         /**