diff options
author | Roman Birg <roman@cyngn.com> | 2015-10-29 16:17:27 -0700 |
---|---|---|
committer | Roman Birg <roman@cyngn.com> | 2016-07-08 14:54:02 -0700 |
commit | 73cb2716f3b92a91cdf2344c5b4f3b51cc5a27b7 (patch) | |
tree | 9b2d9d9d4b35555cf167fee13303a3e9ee45368b | |
parent | 9e1eb0f9f6c0d53bf8a72be94250c0428b53c5f5 (diff) | |
download | android_frameworks_opt_net_wifi-73cb2716f3b92a91cdf2344c5b4f3b51cc5a27b7.tar.gz android_frameworks_opt_net_wifi-73cb2716f3b92a91cdf2344c5b4f3b51cc5a27b7.tar.bz2 android_frameworks_opt_net_wifi-73cb2716f3b92a91cdf2344c5b4f3b51cc5a27b7.zip |
wifi: don't disable AP on sub change if it's the same sub
Ticket: CYNGNOS-1303, CYNGNOS-877
Change-Id: I653fdf40b1419c96e8d611b18d8d899cb5629f5c
Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r-- | service/java/com/android/server/wifi/WifiController.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java index 71735f5da..320db8d59 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -36,6 +36,7 @@ import android.os.Message; import android.os.SystemClock; import android.os.WorkSource; import android.provider.Settings; +import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.Slog; @@ -631,13 +632,27 @@ class WifiController extends StateMachine { public void enter() { mSubListener = new SubscriptionManager.OnSubscriptionsChangedListener() { boolean firstChange = true; + SubscriptionInfo lastSub; @Override public void onSubscriptionsChanged() { + final SubscriptionInfo currentSub = SubscriptionManager.from(mContext) + .getDefaultDataSubscriptionInfo(); if (firstChange) { + lastSub = currentSub; // we always get a state change on registration. firstChange = false; return; } + if (currentSub == null) { + // don't disable when we're not sure yet. + return; + } + if (lastSub != null && currentSub.getSubscriptionId() + == lastSub.getSubscriptionId()) { + // don't disable if it's the same subscription + return; + } + lastSub = currentSub; Toast.makeText(mContext, com.android.internal.R.string.subscription_change_disabled_wifi_ap, Toast.LENGTH_SHORT).show(); |