Fix the BasePreferenceController.createInstance's IllegalStateException am: 7489c93347
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27358857 Change-Id: I7fe4219091a7428f42e4b33d0ccc4445b66569f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -31,6 +31,10 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr
|
|||||||
super(context, preferenceKey, lifecycle, lifecycleOwner);
|
super(context, preferenceKey, lifecycle, lifecycleOwner);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public CallsDefaultSubscriptionController(Context context, String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getDefaultSubscriptionId() {
|
protected int getDefaultSubscriptionId() {
|
||||||
int defaultCallSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();
|
int defaultCallSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();
|
||||||
|
@@ -68,15 +68,19 @@ public class ConvertToEsimPreferenceController extends TelephonyBasePreferenceCo
|
|||||||
|
|
||||||
public ConvertToEsimPreferenceController(Context context, String key, Lifecycle lifecycle,
|
public ConvertToEsimPreferenceController(Context context, String key, Lifecycle lifecycle,
|
||||||
LifecycleOwner lifecycleOwner, int subId) {
|
LifecycleOwner lifecycleOwner, int subId) {
|
||||||
super(context, key);
|
this(context, key);
|
||||||
mSubId = subId;
|
mSubId = subId;
|
||||||
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
|
||||||
mLifecycleOwner = lifecycleOwner;
|
mLifecycleOwner = lifecycleOwner;
|
||||||
if (lifecycle != null) {
|
if (lifecycle != null) {
|
||||||
lifecycle.addObserver(this);
|
lifecycle.addObserver(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ConvertToEsimPreferenceController(Context context, String key) {
|
||||||
|
super(context, key);
|
||||||
|
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
||||||
|
}
|
||||||
|
|
||||||
public void init(int subId, SubscriptionInfoEntity subInfoEntity) {
|
public void init(int subId, SubscriptionInfoEntity subInfoEntity) {
|
||||||
mSubId = subId;
|
mSubId = subId;
|
||||||
mSubscriptionInfoEntity = subInfoEntity;
|
mSubscriptionInfoEntity = subInfoEntity;
|
||||||
|
@@ -64,16 +64,20 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
|
|||||||
|
|
||||||
public DefaultSubscriptionController(Context context, String preferenceKey, Lifecycle lifecycle,
|
public DefaultSubscriptionController(Context context, String preferenceKey, Lifecycle lifecycle,
|
||||||
LifecycleOwner lifecycleOwner) {
|
LifecycleOwner lifecycleOwner) {
|
||||||
|
this(context, preferenceKey);
|
||||||
|
mLifecycleOwner = lifecycleOwner;
|
||||||
|
if (lifecycle != null) {
|
||||||
|
lifecycle.addObserver(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public DefaultSubscriptionController(Context context, String preferenceKey) {
|
||||||
super(context, preferenceKey);
|
super(context, preferenceKey);
|
||||||
mManager = context.getSystemService(SubscriptionManager.class);
|
mManager = context.getSystemService(SubscriptionManager.class);
|
||||||
mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()
|
mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()
|
||||||
== View.LAYOUT_DIRECTION_RTL;
|
== View.LAYOUT_DIRECTION_RTL;
|
||||||
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
||||||
mDataSubscriptionChangedReceiver = new DefaultSubscriptionReceiver(context, this);
|
mDataSubscriptionChangedReceiver = new DefaultSubscriptionReceiver(context, this);
|
||||||
mLifecycleOwner = lifecycleOwner;
|
|
||||||
if (lifecycle != null) {
|
|
||||||
lifecycle.addObserver(this);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return the id of the default subscription for the service, or
|
/** @return the id of the default subscription for the service, or
|
||||||
|
@@ -73,16 +73,20 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon
|
|||||||
|
|
||||||
public MobileDataPreferenceController(Context context, String key, Lifecycle lifecycle,
|
public MobileDataPreferenceController(Context context, String key, Lifecycle lifecycle,
|
||||||
LifecycleOwner lifecycleOwner, int subId) {
|
LifecycleOwner lifecycleOwner, int subId) {
|
||||||
super(context, key);
|
this(context, key);
|
||||||
mSubId = subId;
|
mSubId = subId;
|
||||||
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
|
|
||||||
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
|
||||||
mLifecycleOwner = lifecycleOwner;
|
mLifecycleOwner = lifecycleOwner;
|
||||||
if (lifecycle != null) {
|
if (lifecycle != null) {
|
||||||
lifecycle.addObserver(this);
|
lifecycle.addObserver(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MobileDataPreferenceController(Context context, String key) {
|
||||||
|
super(context, key);
|
||||||
|
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
|
||||||
|
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus(int subId) {
|
public int getAvailabilityStatus(int subId) {
|
||||||
if (Flags.isDualSimOnboardingEnabled()) {
|
if (Flags.isDualSimOnboardingEnabled()) {
|
||||||
|
@@ -63,16 +63,20 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro
|
|||||||
|
|
||||||
public RoamingPreferenceController(Context context, String key, Lifecycle lifecycle,
|
public RoamingPreferenceController(Context context, String key, Lifecycle lifecycle,
|
||||||
LifecycleOwner lifecycleOwner, int subId) {
|
LifecycleOwner lifecycleOwner, int subId) {
|
||||||
super(context, key);
|
this(context, key);
|
||||||
mSubId = subId;
|
mSubId = subId;
|
||||||
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
|
|
||||||
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
|
||||||
mLifecycleOwner = lifecycleOwner;
|
mLifecycleOwner = lifecycleOwner;
|
||||||
if (lifecycle != null) {
|
if (lifecycle != null) {
|
||||||
lifecycle.addObserver(this);
|
lifecycle.addObserver(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RoamingPreferenceController(Context context, String key) {
|
||||||
|
super(context, key);
|
||||||
|
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
|
||||||
|
mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
|
final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
|
||||||
|
@@ -35,6 +35,12 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl
|
|||||||
.getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support);
|
.getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public SmsDefaultSubscriptionController(Context context, String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
mIsAskEverytimeSupported = mContext.getResources()
|
||||||
|
.getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getDefaultSubscriptionId() {
|
protected int getDefaultSubscriptionId() {
|
||||||
int defaultSmsSubId = SubscriptionManager.getDefaultSmsSubscriptionId();
|
int defaultSmsSubId = SubscriptionManager.getDefaultSmsSubscriptionId();
|
||||||
|
Reference in New Issue
Block a user