Merge "Fix Calls/SMS default SIM selector" into qt-dev am: 7af299c604 am: 24ebff2ff3

am: 40a63920f5

Change-Id: Icd3286369b6ff0abd9eccfc75cedc2b8acc8f544

src/com/android/settings/network/telephony/DefaultSubscriptionController.java

@@ -121,6 +121,11 @@ public abstract class DefaultSubscriptionController extends BasePreferenceContro
         }
         mPreference.setVisible(true);
 
+        // TODO(b/135142209) - for now we need to manually ensure we're registered as a change
+        // listener, because this might not have happened during displayPreference if
+        // getAvailabilityStatus returned CONDITIONALLY_UNAVAILABLE at the time.
+        mPreference.setOnPreferenceChangeListener(this);
+
         final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mManager);
 
         // We'll have one entry for each available subscription, plus one for a "ask me every