commit 1be1a134c8ea4553662cf4e5cbb7ddce43c6b73e
author Yuhao Zheng <yuhaozheng@google.com> Fri Jun 20 14:45:20 2014 -0700
committer Yuhao Zheng <yuhaozheng@google.com> Tue Jul 01 13:48:09 2014 -0700
tree 17888214f1d258584c954cc35184f706399d3232
parent c3182c557396cb7ac149fd2dba36ac779b809263

Hotspot 2.0 fix launch browser method

Change-Id: I484b526fa92c4e3651e8fe6ae5614f22ba8134d4

wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java

diff --git a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
index e7e6767..ddca85e 100644
--- a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
+++ b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
@@ -221,12 +221,22 @@
             return key;
         }
 
-        private Object getListener(int key, boolean force) {
-            Log.d(TAG, "getListener() key=" + key + " force=" + force);
+        private Object peekListener(int key) {
+            Log.d(TAG, "peekListener() key=" + key);
             if (key == INVALID_LISTENER_KEY)
                 return null;
             synchronized (mListenerMapLock) {
-                if (!force) {
+                return mListenerMap.get(key);
+            }
+        }
+
+
+        private Object getListener(int key, boolean forceRemove) {
+            Log.d(TAG, "getListener() key=" + key + " force=" + forceRemove);
+            if (key == INVALID_LISTENER_KEY)
+                return null;
+            synchronized (mListenerMapLock) {
+                if (!forceRemove) {
                     int count = mListenerMapCount.get(key);
                     Log.d(TAG, "count=" + count);
                     mListenerMapCount.put(key, --count);
@@ -322,7 +332,7 @@
                         break;
 
                     case START_OSU_BROWSER:
-                        listener = getListener(message.arg2, true);
+                        listener = peekListener(message.arg2);
                         if (listener != null) {
                             ParcelableString str = (ParcelableString) message.obj;
                             if (str == null || str.string == null)