diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2014-07-01 20:58:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-01 19:22:38 +0000 |
| commit | a0de0e59c0f110e80ccce88fb339f18ec8149c3b (patch) | |
| tree | c1e3414ad0e3186c9eeecce90942935f10401ddf | |
| parent | a5736291bd5e1b953beabff8aadc6be2fc7a6f6d (diff) | |
| parent | 1be1a134c8ea4553662cf4e5cbb7ddce43c6b73e (diff) | |
| download | frameworks_base-a0de0e59c0f110e80ccce88fb339f18ec8149c3b.zip frameworks_base-a0de0e59c0f110e80ccce88fb339f18ec8149c3b.tar.gz frameworks_base-a0de0e59c0f110e80ccce88fb339f18ec8149c3b.tar.bz2 | |
Merge "Hotspot 2.0 fix launch browser method"
| -rw-r--r-- | wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java | 18 |
1 files changed, 14 insertions, 4 deletions
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 @@ public class WifiPasspointManager { 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 @@ public class WifiPasspointManager { 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) |