diff options
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index b380ac53ddad..c5c116982b42 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -1048,15 +1048,20 @@ public class AccessPoint implements Comparable<AccessPoint> { if (newLevel > 0 && newLevel != oldLevel) { // Only update labels on visible rssi changes updateSpeed(); - if (mAccessPointListener != null) { - ThreadUtils.postOnMainThread(() -> mAccessPointListener.onLevelChanged(this)); - } - } + ThreadUtils.postOnMainThread(() -> { + if (mAccessPointListener != null) { + mAccessPointListener.onLevelChanged(this); + } + }); - if (mAccessPointListener != null) { - ThreadUtils.postOnMainThread(() -> mAccessPointListener.onAccessPointChanged(this)); } + ThreadUtils.postOnMainThread(() -> { + if (mAccessPointListener != null) { + mAccessPointListener.onAccessPointChanged(this); + } + }); + if (!scanResults.isEmpty()) { ScanResult result = scanResults.iterator().next(); @@ -1102,10 +1107,18 @@ public class AccessPoint implements Comparable<AccessPoint> { mNetworkInfo = null; } if (updated && mAccessPointListener != null) { - ThreadUtils.postOnMainThread(() -> mAccessPointListener.onAccessPointChanged(this)); + ThreadUtils.postOnMainThread(() -> { + if (mAccessPointListener != null) { + mAccessPointListener.onAccessPointChanged(this); + } + }); if (oldLevel != getLevel() /* current level */) { - ThreadUtils.postOnMainThread(() -> mAccessPointListener.onLevelChanged(this)); + ThreadUtils.postOnMainThread(() -> { + if (mAccessPointListener != null) { + mAccessPointListener.onLevelChanged(this); + } + }); } } @@ -1115,9 +1128,11 @@ public class AccessPoint implements Comparable<AccessPoint> { void update(@Nullable WifiConfiguration config) { mConfig = config; networkId = config != null ? config.networkId : WifiConfiguration.INVALID_NETWORK_ID; - if (mAccessPointListener != null) { - ThreadUtils.postOnMainThread(() -> mAccessPointListener.onAccessPointChanged(this)); - } + ThreadUtils.postOnMainThread(() -> { + if (mAccessPointListener != null) { + mAccessPointListener.onAccessPointChanged(this); + } + }); } @VisibleForTesting |