diff options
| author | David Christie <dnchrist@google.com> | 2013-09-20 13:13:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-20 13:13:54 -0700 |
| commit | 2875fb8586a9ffa42d63fd078fc5115791564680 (patch) | |
| tree | a8ed403d51f9b0b9a2283b057af28ada4e94b0b2 /wifi | |
| parent | 69527ad1de89acd033fc428d7518a6e833670fe7 (diff) | |
| parent | 0e50080395d2ed9e3c703f769ea3fb84706f989a (diff) | |
| download | frameworks_base-2875fb8586a9ffa42d63fd078fc5115791564680.zip frameworks_base-2875fb8586a9ffa42d63fd078fc5115791564680.tar.gz frameworks_base-2875fb8586a9ffa42d63fd078fc5115791564680.tar.bz2 | |
am 0e500803: am f31a7897: Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev
* commit '0e50080395d2ed9e3c703f769ea3fb84706f989a':
Clear names from externally supplied WorkSources to WifiManager (b/10733757)
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 95ee85b..b7594ee 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1867,13 +1867,16 @@ public class WifiManager { boolean changed = true; if (ws == null) { mWorkSource = null; - } else if (mWorkSource == null) { - changed = mWorkSource != null; - mWorkSource = new WorkSource(ws); } else { - changed = mWorkSource.diff(ws); - if (changed) { - mWorkSource.set(ws); + ws.clearNames(); + if (mWorkSource == null) { + changed = mWorkSource != null; + mWorkSource = new WorkSource(ws); + } else { + changed = mWorkSource.diff(ws); + if (changed) { + mWorkSource.set(ws); + } } } if (changed && mHeld) { |