diff options
| author | Roman Birg <roman@cyngn.com> | 2016-06-22 15:12:01 -0700 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2016-06-25 10:55:31 -0700 |
| commit | 90501cb1e0a6c51bc7c30565bec9889589d7e04a (patch) | |
| tree | 0ad6e8c070e379e684d8d14c2b5b69d4f5d1dc88 /src/java/com | |
| parent | b3d90614fba215ed3d5e5407578d4f4af2d2fd2d (diff) | |
| download | android_frameworks_opt_telephony-90501cb1e0a6c51bc7c30565bec9889589d7e04a.tar.gz android_frameworks_opt_telephony-90501cb1e0a6c51bc7c30565bec9889589d7e04a.tar.bz2 android_frameworks_opt_telephony-90501cb1e0a6c51bc7c30565bec9889589d7e04a.zip | |
Subscription updater: don't turn data off if we've never set a deafult
In the case of an MSIM device that has only had 1 SIM and then you swap
the sim to another slot, the data will turn off, but it's the same SIM
and should not.
Change-Id: I77ed8c22663aa10d211e6f4de06b791c1a8f0971
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/java/com')
| -rw-r--r-- | src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java index 9a27beba8..0b489a94f 100644 --- a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java +++ b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java @@ -767,7 +767,11 @@ public class SubscriptionInfoUpdater extends Handler { Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION, SubscriptionManager.INVALID_SUBSCRIPTION_ID); - if (realStoredDataSub != SubscriptionManager.getDefaultDataSubId()) { + if (realStoredDataSub != SubscriptionManager.INVALID_SUBSCRIPTION_ID && + realStoredDataSub != SubscriptionManager.getDefaultDataSubId()) { + logd("switching data off; real stored sub: " + realStoredDataSub + + ", and we think the default sub id is now: " + + SubscriptionManager.getDefaultDataSubId()); PhoneFactory.getDefaultPhone().setDataEnabled(false); } |