commit 4ec1828a05c7cce1a38a6cb0c3e55c3dec28e4f6
author Malcolm Chen <refuhoo@google.com> Wed Feb 05 15:05:38 2020 -0800
committer Xiangyu/Malcolm Chen <refuhoo@google.com> Fri Feb 14 01:23:40 2020 +0000
tree 5f4951191245723622e91ac9bff217ebb75af211
parent be8186cc5af5b6f47d483cd7ecfe43df0e39b861

Do not set a sub as default data sub unless it's active.

Bug: 146446143
Test: unittest & manually reproduced the failure and verified
the fix
Change-Id: I7ed35dc019c8bda27efba34ede549df2eec62e3c
Merged-In: I7ed35dc019c8bda27efba34ede549df2eec62e3c

src/java/com/android/internal/telephony/MultiSimSettingController.java

diff --git a/src/java/com/android/internal/telephony/MultiSimSettingController.java b/src/java/com/android/internal/telephony/MultiSimSettingController.java
index 8d72ce0..9c7c4ed 100644
--- a/src/java/com/android/internal/telephony/MultiSimSettingController.java
+++ b/src/java/com/android/internal/telephony/MultiSimSettingController.java
@@ -283,7 +283,7 @@
 
         // If user is enabling a non-default non-opportunistic subscription, make it default.
         if (mSubController.getDefaultDataSubId() != subId && !mSubController.isOpportunistic(subId)
-                && enable) {
+                && enable && mSubController.isActiveSubId(subId)) {
             mSubController.setDefaultDataSubId(subId);
         }
     }