commit 4839eb565b4294443a34a93ee2ca93ac70b72b87
author fionaxu <fionaxu@google.com> Tue Nov 22 13:59:43 2016 -0800
committer fionaxu <fionaxu@google.com> Tue Nov 22 13:59:43 2016 -0800
tree ea7518b20734c90070ed4d8c41dc5c29a573440f
parent a4e2afb6a96c5a2350586df3d6884dc80d87f2c4

Re-evaluate Otasp state when reenable metered APNs

- when carrier action is set to re-enable metered APNs, framework should
  unset unprovisoned otasp state. trigger re-evaluation and notify all
  registrants instead.

Bug: 32956839
Test: Telephony Unit Tests
Change-Id: Id370b84e0abe72356d16096253e481280e76e1b4

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index c9d5f55..54df020 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -2384,6 +2384,10 @@
                     // Tear down all metered apns
                     cleanUpAllConnections(true, Phone.REASON_CARRIER_ACTION_DISABLE_METERED_APN);
                 } else {
+                    // Re-evauluate Otasp state
+                    int otaspState = mPhone.getServiceStateTracker().getOtasp();
+                    mPhone.notifyOtaspChanged(otaspState);
+
                     teardownRestrictedMeteredConnections();
                     setupDataOnConnectableApns(Phone.REASON_DATA_ENABLED);
                 }