commit 1da0e30d6f53ec71a76cad04fc8ac5b5851bf188
author Vineeta Srivastava <vsrivastava@google.com> Tue Dec 08 22:58:52 2015 +0000
committer The Android Automerger <android-build@google.com> Wed Dec 09 00:34:58 2015 +0000
tree c3aa182652defeb0cd92fbc5f3b28961a761171c
parent 97cb5ed3a793927d20061e8590e133912cf03d2e

Revert "Fix problem with cell data service after SIM swap"

This reverts commit de5bdca0e91d156f1cc02ece70166db633cb1fa2.

Bug: 26039698
Change-Id: Ie29e021984f6abd412068f5b48866af3efab525a

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

diff --git a/src/java/com/android/internal/telephony/dataconnection/DctController.java b/src/java/com/android/internal/telephony/dataconnection/DctController.java
index f4caf9e..b071e6e 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DctController.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DctController.java
@@ -392,7 +392,12 @@
                 + ", activePhoneId=" + activePhoneId);
 
         if (requestedPhoneId == INVALID_PHONE_INDEX) {
-            // we have no network request - don't bother with this
+            // either we have no network request
+            // or there is no valid subscription at the moment
+            if (activePhoneId != INVALID_PHONE_INDEX) {
+                // detatch so we can try connecting later
+                mDcSwitchAsyncChannel[activePhoneId].disconnectAll();
+            }
             return;
         }