PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt cross-SIM enablement when auto data switch enabled

Browse Source 
- For devices that have opted in with overlay config, enabling a 2nd SIM
and modifying 'Switch mobile data automatically' will update cross-SIM
calling enablement.
- These updates will be logged as settings events.

Bug: 260266794
Test: Live tests for cross-SIM calling across both subs.
Change-Id: I64d25ca406877ca5f061064e0a3b23f54c125638
This commit is contained in:
Aswin Sankar
2023-02-03 15:23:52 -08:00
parent 65785048a6
commit ff8f96c0be
5 changed files with 205 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/ActiveSubscriptionsListener.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.network;
import android.annotation.NonNull;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -277,6 +278,15 @@ public abstract class ActiveSubscriptionsListener
return null;
}
/**
* Gets a list of active, visible subscription Id(s) of the currently active SIM(s).
*
* @return the list of subId's that are active and visible; the length may be 0.
*/
public @NonNull int[] getActiveSubscriptionIdList() {
return getSubscriptionManager().getActiveSubscriptionIdList();
}
/**
* Clear data cached within listener
*/

10
src/com/android/settings/network/ProxySubscriptionManager.java
View File

@@ -20,6 +20,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY;
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import android.annotation.NonNull;
import android.content.Context;
import android.os.Looper;
import android.provider.Settings;
@@ -241,6 +242,15 @@ public class ProxySubscriptionManager implements LifecycleObserver {
return mSubscriptionMonitor.getAccessibleSubscriptionInfo(subId);
}
/**
* Gets a list of active, visible subscription Id(s) of the currently active SIM(s).
*
* @return the list of subId's that are active and visible; the length may be 0.
*/
public @NonNull int[] getActiveSubscriptionIdList() {
return mSubscriptionMonitor.getActiveSubscriptionIdList();
}
/**
* Clear data cached within proxy
*/

87
src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
View File

@@ -19,12 +19,20 @@ package com.android.settings.network.telephony;
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.ims.ImsException;
import android.telephony.ims.ImsManager;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
@@ -32,9 +40,14 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.network.MobileDataContentObserver;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.SubscriptionsChangeListener;
import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Controls whether switch mobile data to the non-default SIM if the non-default SIM has better
@@ -49,6 +62,7 @@ import com.android.settings.network.SubscriptionsChangeListener;
public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenceController
implements LifecycleObserver,
SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
private static final String LOG_TAG = "AutoDataSwitchPrefCtrl";
private SwitchPreference mPreference;
private SubscriptionsChangeListener mChangeListener;
@@ -56,9 +70,12 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc
private MobileDataContentObserver mMobileDataContentObserver;
private PreferenceScreen mScreen;
private final MetricsFeatureProvider mMetricsFeatureProvider;
public AutoDataSwitchPreferenceController(Context context,
String preferenceKey) {
super(context, preferenceKey);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
void init(int subId) {
@@ -103,11 +120,36 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc
TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH);
}
private int getOtherSubId(@NonNull int[] subIds) {
if (subIds.length > 1) {
for (int subId : subIds) {
if (subId != mSubId) {
return subId;
}
}
}
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
private boolean isEnabled(int subId) {
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
return false;
}
TelephonyManager telephonyManager = mContext.getSystemService(
TelephonyManager.class).createForSubscriptionId(subId);
return telephonyManager != null && telephonyManager.isMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH);
}
@Override
public boolean setChecked(boolean isChecked) {
mManager.setMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
isChecked);
if (mContext.getResources().getBoolean(
R.bool.config_auto_data_switch_enables_cross_sim_calling)) {
trySetCrossSimCalling(mContext, getActiveSubscriptionIdList(), isChecked /* enabled */);
}
return true;
}
@@ -116,6 +158,40 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc
return DataUsageUtils.hasMobileData(mContext);
}
private boolean isCrossSimCallingAllowedByPlatform(Context context, int subId) {
if ((new WifiCallingQueryImsState(context, subId)).isWifiCallingSupported()) {
PersistableBundle bundle = getCarrierConfigForSubId(subId);
return (bundle != null) && bundle.getBoolean(
CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL,
false /*default*/);
}
return false;
}
protected ImsMmTelManager getImsMmTelManager(Context context, int subId) {
ImsManager imsMgr = context.getSystemService(ImsManager.class);
return (imsMgr == null) ? null : imsMgr.getImsMmTelManager(subId);
}
private void trySetCrossSimCallingPerSub(Context context, int subId, boolean enabled) {
try {
getImsMmTelManager(context, subId).setCrossSimCallingEnabled(enabled);
} catch (ImsException | IllegalArgumentException | NullPointerException exception) {
Log.w(LOG_TAG, "failed to change cross SIM calling configuration to " + enabled
+ " for subID " + subId + "with exception: ", exception);
}
}
private void trySetCrossSimCalling(Context context, int[] subIds, boolean enabled) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_UPDATE_CROSS_SIM_CALLING_ON_AUTO_DATA_SWITCH_EVENT, enabled);
for (int subId : subIds) {
if (isCrossSimCallingAllowedByPlatform(context, subId)) {
trySetCrossSimCallingPerSub(context, subId, enabled);
}
}
}
@Override
public int getAvailabilityStatus(int subId) {
if (!SubscriptionManager.isValidSubscriptionId(subId)
@@ -143,11 +219,20 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc
updateState(mPreference);
}
private int[] getActiveSubscriptionIdList() {
return ProxySubscriptionManager.getInstance(mContext).getActiveSubscriptionIdList();
}
/**
* Trigger displaying preference when Mobilde data content changed.
* Trigger displaying preference when Mobile data content changed.
*/
@VisibleForTesting
public void refreshPreference() {
if (mContext.getResources().getBoolean(
R.bool.config_auto_data_switch_enables_cross_sim_calling)) {
int[] subIds = getActiveSubscriptionIdList();
trySetCrossSimCalling(mContext, subIds, isEnabled(getOtherSubId(subIds)));
}
if (mScreen != null) {
super.displayPreference(mScreen);
}