commit 01b34d568501b8b4c932b0415ac9170cec1befef
author Neil Fuller <nfuller@google.com> Fri Oct 12 07:59:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 12 07:59:15 2018 +0000
tree 8667be67b9f7cbebf3642d27a40ab93ba783ade3
parent cf76bd286d295048f3836f58b629c4f5cf914ec0
parent 96dc39b2436742fcb4c9f113a37b6549102e55b2

Merge "Remove explicit dependencies on "core" libraries"

Common/src/com/googlecode/android_scripting/facade/wifi/WifiP2pManagerFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiP2pManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiP2pManagerFacade.java
index b6a2e05..c494a95 100644
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiP2pManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiP2pManagerFacade.java
@@ -51,6 +51,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -410,7 +411,9 @@
             @RpcParameter(name = "serviceType") String serviceType,
             @RpcParameter(name = "txtMap") JSONObject txtMap) throws JSONException {
         Map<String, String> map = new HashMap<String, String>();
-        for (String key : txtMap.keySet()) {
+        Iterator<String> keyIterator = txtMap.keys();
+        while (keyIterator.hasNext()) {
+            String key = keyIterator.next();
             map.put(key, txtMap.getString(key));
         }
         mServiceInfo = WifiP2pDnsSdServiceInfo.newInstance(instanceName, serviceType, map);