aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gruver <bgruv@google.com>2015-06-18 11:52:05 -0700
committerBen Gruver <bgruv@google.com>2015-06-18 13:34:12 -0700
commit7c97ddbb45ce06793b4df17fe5e8d49fdf4cf11e (patch)
treedced82b9eb1d4923c8d045a1be850577fb0b7c35
parent0f1e9950991772b8fb7c053f25e0f316999a82e1 (diff)
downloadsmali-7c97ddbb45ce06793b4df17fe5e8d49fdf4cf11e.tar.gz
Remove usages of the deprecated Iterators.emptyIterator() method
-rw-r--r--dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java4
-rw-r--r--dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/DebugInfo.java5
2 files changed, 5 insertions, 4 deletions
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java
index f26b7e12..eccb9218 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java
@@ -32,7 +32,7 @@
package org.jf.dexlib2.dexbacked;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterators;
+import com.google.common.collect.ImmutableSet;
import org.jf.dexlib2.base.reference.BaseMethodReference;
import org.jf.dexlib2.dexbacked.raw.MethodIdItem;
import org.jf.dexlib2.dexbacked.raw.ProtoIdItem;
@@ -152,7 +152,7 @@ public class DexBackedMethod extends BaseMethodReference implements Method {
if (methodImpl != null) {
return methodImpl.getParameterNames(null);
}
- return Iterators.emptyIterator();
+ return ImmutableSet.<String>of().iterator();
}
@Nonnull
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/DebugInfo.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/DebugInfo.java
index 6759820e..db27d923 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/DebugInfo.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/DebugInfo.java
@@ -31,12 +31,13 @@
package org.jf.dexlib2.dexbacked.util;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterators;
import org.jf.dexlib2.AccessFlags;
import org.jf.dexlib2.DebugItemType;
+import org.jf.dexlib2.dexbacked.DexBackedDexFile;
import org.jf.dexlib2.dexbacked.DexBackedMethod;
import org.jf.dexlib2.dexbacked.DexBackedMethodImplementation;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
import org.jf.dexlib2.dexbacked.DexReader;
import org.jf.dexlib2.iface.MethodParameter;
import org.jf.dexlib2.iface.debug.DebugItem;
@@ -72,7 +73,7 @@ public abstract class DebugInfo implements Iterable<DebugItem> {
private EmptyDebugInfo() {}
@Nonnull @Override public Iterator<DebugItem> iterator() { return Iterators.emptyIterator(); }
@Nonnull @Override public Iterator<String> getParameterNames(@Nullable DexReader reader) {
- return Iterators.emptyIterator();
+ return ImmutableSet.<String>of().iterator();
}
}