diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-01 03:42:58 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-01 03:42:58 +0000 |
commit | b7ddf3c7f15d1d39b9f1d26c81a1793514f9fb6c (patch) | |
tree | ca68c9c3888e6b365f1c6157e368bf6a1aa34374 | |
parent | e7bba10b5e664d2da74cbbd6c5897de7bacd3639 (diff) | |
parent | 098f5d3f084147bf7ec538199ae77783ef6e7d1d (diff) | |
download | telephony-android11-d1-s5-release.tar.gz |
Merge cherrypicks of [12742081, 12740729, 12741823, 12741149, 12740897, 12740898, 12741537, 12742616, 12742617, 12742618, 12741671, 12738804, 12740899, 12740900, 12740901, 12740797, 12740798, 12742180, 12742181, 12740730, 12741672, 12741673, 12742182, 12742183] into rvc-d1-releaseandroid-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-release
Change-Id: Ieaa857a39399004f40dbf3191f4047fd9f3429c6
-rw-r--r-- | src/java/com/android/internal/telephony/dataconnection/DcTracker.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java index 9d062ab258..dc966ae4a4 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java @@ -326,7 +326,7 @@ public class DcTracker extends Handler { private boolean mNrSaSub6Unmetered = false; private boolean mRoamingUnmetered = false; - /* List of SubscriptionPlans, updated on SubscriptionManager.setSubscriptionPlans */ + /* List of SubscriptionPlans, updated when initialized and when plans are changed. */ private List<SubscriptionPlan> mSubscriptionPlans = null; @SimState @@ -421,6 +421,7 @@ public class DcTracker extends Handler { if (mPhone == null || mPhone.getSubId() != subId) return; mSubscriptionPlans = plans == null ? null : Arrays.asList(plans); + if (DBG) log("SubscriptionPlans changed: " + mSubscriptionPlans); reevaluateUnmeteredConnections(); } }; @@ -2307,6 +2308,13 @@ public class DcTracker extends Handler { setDefaultDataRoamingEnabled(); read5GConfiguration(); registerSettingsObserver(); + SubscriptionPlan[] plans = mNetworkPolicyManager.getSubscriptionPlans( + mPhone.getSubId(), mPhone.getContext().getOpPackageName()); + if (plans != null) { + mSubscriptionPlans = Arrays.asList(plans); + if (DBG) log("SubscriptionPlans initialized: " + mSubscriptionPlans); + reevaluateUnmeteredConnections(); + } mConfigReady = true; } |