From 20f675b86ba7febb5adde78596ffd68485d6ead0 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sun, 10 Nov 2013 21:36:12 -0800
Subject: [PATCH] When writing a debug item, always include all parameters

---
 .../src/main/java/org/jf/dexlib2/writer/DexWriter.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
index 55ceb9c7..1886db0c 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
@@ -798,18 +798,20 @@ public abstract class DexWriter<
                                @Nullable Iterable<? extends StringKey> parameterNames,
                                @Nullable Iterable<? extends DebugItem> debugItems) throws IOException {
         int parameterCount = 0;
+        int lastNamedParameterIndex = -1;
         if (parameterNames != null) {
+            parameterCount = Iterables.size(parameterNames);
             int index = 0;
             for (StringKey parameterName: parameterNames) {
-                index++;
                 if (parameterName != null) {
-                    parameterCount = index;
+                    lastNamedParameterIndex = index;
                 }
+                index++;
             }
         }
 
 
-        if (parameterCount == 0 && (debugItems == null || Iterables.isEmpty(debugItems))) {
+        if (lastNamedParameterIndex == -1 && (debugItems == null || Iterables.isEmpty(debugItems))) {
             return NO_OFFSET;
         }