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

Replace allowedNetworkTypes with allowedNetworkTypesForReason

Browse Source 
- Replace getAllowedNetworkTypes with
getallowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_CARRIER)
- Replace "Settings.Global.PREFERRED_NETWORK_MODE" with
"getAllowedNetworkTypesForReason(USER)"
- Move EnabledNetworkModePreferenceControllerTest from robotests to unit
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT
- Rename PreferredNetworkModeContentObserver to AllowedNetworkTypesListener
Bug: 161434786
Test: build pass.
(PASS)atest CdmaSystemSelectPreferenceControllerTest
(PASS)atest PreferredNetworkModePreferenceControllerTest
(PASS)atest AllowedNetworkTypesListenerTest
(PASS)atest EnabledNetworkModePreferenceControllerTest
(PASS)atest MobileNetworkUtilsTest

Change-Id: I2b981569ad11cf70a558c1952cc2e077464328d8
Merged-In: I2b981569ad11cf70a558c1952cc2e077464328d8
This commit is contained in:
SongFerngWang
2021-01-12 21:20:36 +08:00
parent 191136002b
commit fc435e3736
17 changed files with 478 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/com/android/settings/network/AllowedNetworkTypesListener.java Normal file
View File

@@ -0,0 +1,93 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network;
import android.content.Context;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import java.util.Map;
import java.util.concurrent.Executor;
/**
* {@link PhoneStateListener} to listen to Allowed Network Types changed
*/
public class AllowedNetworkTypesListener extends PhoneStateListener implements
PhoneStateListener.AllowedNetworkTypesChangedListener {
private static final String LOG_TAG = "NetworkModeListener";
@VisibleForTesting
AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener;
private long mAllowedNetworkType = -1;
private Executor mExecutor;
public AllowedNetworkTypesListener(Executor executor) {
super();
mExecutor = executor;
}
public void setAllowedNetworkTypesChangedListener(OnAllowedNetworkTypesChangedListener lsn) {
mListener = lsn;
}
/**
* Register a PhoneStateListener for Allowed Network Types changed.
* @param context the Context
* @param subId the subscription id.
*/
public void register(Context context, int subId) {
TelephonyManager telephonyManager = context.getSystemService(
TelephonyManager.class).createForSubscriptionId(subId);
telephonyManager.registerPhoneStateListener(mExecutor, this);
}
/**
* Unregister a PhoneStateListener for Allowed Network Types changed.
* @param context the Context
* @param subId the subscription id.
*/
public void unregister(Context context, int subId) {
TelephonyManager telephonyManager = context.getSystemService(
TelephonyManager.class).createForSubscriptionId(subId);
telephonyManager.unregisterPhoneStateListener(this);
}
@Override
public void onAllowedNetworkTypesChanged(Map<Integer, Long> allowedNetworkTypesList) {
long newAllowedNetworkType = allowedNetworkTypesList.get(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER);
if (mListener != null && mAllowedNetworkType != newAllowedNetworkType) {
mListener.onAllowedNetworkTypesChanged();
Log.d(LOG_TAG, "onAllowedNetworkChanged: " + mAllowedNetworkType);
}
mAllowedNetworkType = newAllowedNetworkType;
}
/**
* Listener for update of Preferred Network Mode change
*/
public interface OnAllowedNetworkTypesChangedListener {
/**
* Notify the allowed network type changed.
*/
void onAllowedNetworkTypesChanged();
}
}

66
src/com/android/settings/network/PreferredNetworkModeContentObserver.java
View File

@@ -1,66 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
/**
* {@link ContentObserver} to listen to Preferred Network Mode change
*/
public class PreferredNetworkModeContentObserver extends ContentObserver {
@VisibleForTesting
OnPreferredNetworkModeChangedListener mListener;
public PreferredNetworkModeContentObserver(Handler handler) {
super(handler);
}
public void setPreferredNetworkModeChangedListener(OnPreferredNetworkModeChangedListener lsn) {
mListener = lsn;
}
@Override
public void onChange(boolean selfChange) {
super.onChange(selfChange);
if (mListener != null) {
mListener.onPreferredNetworkModeChanged();
}
}
public void register(Context context, int subId) {
final Uri uri = Settings.Global.getUriFor(
Settings.Global.PREFERRED_NETWORK_MODE + subId);
context.getContentResolver().registerContentObserver(uri, false, this);
}
public void unregister(Context context) {
context.getContentResolver().unregisterContentObserver(this);
}
/**
* Listener for update of Preferred Network Mode change
*/
public interface OnPreferredNetworkModeChangedListener {
void onPreferredNetworkModeChanged();
}
}

42
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -20,10 +20,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -37,7 +34,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.network.PreferredNetworkModeContentObserver;
import com.android.settings.network.AllowedNetworkTypesListener;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import java.util.ArrayList;
@@ -53,7 +50,7 @@ public class EnabledNetworkModePreferenceController extends
ListPreference.OnPreferenceChangeListener, LifecycleObserver {
private static final String LOG_TAG = "EnabledNetworkMode";
private PreferredNetworkModeContentObserver mPreferredNetworkModeObserver;
private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
private Preference mPreference;
private PreferenceScreen mPreferenceScreen;
private TelephonyManager mTelephonyManager;
@@ -88,18 +85,18 @@ public class EnabledNetworkModePreferenceController extends
@OnLifecycleEvent(ON_START)
public void onStart() {
if (mPreferredNetworkModeObserver == null) {
if (mAllowedNetworkTypesListener == null) {
return;
}
mPreferredNetworkModeObserver.register(mContext, mSubId);
mAllowedNetworkTypesListener.register(mContext, mSubId);
}
@OnLifecycleEvent(ON_STOP)
public void onStop() {
if (mPreferredNetworkModeObserver == null) {
if (mAllowedNetworkTypesListener == null) {
return;
}
mPreferredNetworkModeObserver.unregister(mContext);
mAllowedNetworkTypesListener.unregister(mContext, mSubId);
}
@Override
@@ -145,10 +142,10 @@ public class EnabledNetworkModePreferenceController extends
mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
mBuilder = new PreferenceEntriesBuilder(mContext, mSubId);
if (mPreferredNetworkModeObserver == null) {
mPreferredNetworkModeObserver = new PreferredNetworkModeContentObserver(
new Handler(Looper.getMainLooper()));
mPreferredNetworkModeObserver.setPreferredNetworkModeChangedListener(
if (mAllowedNetworkTypesListener == null) {
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
mContext.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
() -> updatePreference());
}
@@ -205,13 +202,12 @@ public class EnabledNetworkModePreferenceController extends
.createForSubscriptionId(mSubId);
final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
final boolean isNrEnabledFromCarrierConfig = carrierConfig != null
&& carrierConfig.getBoolean(CarrierConfigManager.KEY_NR_ENABLED_BOOL);
mAllowed5gNetworkType = checkSupportedRadioBitmask(
mTelephonyManager.getAllowedNetworkTypes(),
mTelephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER),
TelephonyManager.NETWORK_TYPE_BITMASK_NR);
mSupported5gRadioAccessFamily = isNrEnabledFromCarrierConfig
&& checkSupportedRadioBitmask(mTelephonyManager.getSupportedRadioAccessFamily(),
mSupported5gRadioAccessFamily = checkSupportedRadioBitmask(
mTelephonyManager.getSupportedRadioAccessFamily(),
TelephonyManager.NETWORK_TYPE_BITMASK_NR);
mIsGlobalCdma = mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
&& carrierConfig != null
@@ -370,9 +366,9 @@ public class EnabledNetworkModePreferenceController extends
}
private int getPreferredNetworkMode() {
int networkMode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
int networkMode = MobileNetworkUtils.getNetworkTypeFromRaf(
(int) mTelephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
if (!showNrList()) {
Log.d(LOG_TAG, "Network mode :" + networkMode + " reduce NR");
networkMode = reduceNrToLteNetworkType(networkMode);
@@ -452,7 +448,7 @@ public class EnabledNetworkModePreferenceController extends
* Sets the display string for the network mode choice and selects the corresponding item
*
* @param networkMode the current network mode. The current mode might not be an option in
* the choice list. The nearest choice is selected instead
* the choice list. The nearest choice is selected instead
*/
void setPreferenceValueAndSummary(int networkMode) {
setSelectedEntry(networkMode);
@@ -781,7 +777,7 @@ public class EnabledNetworkModePreferenceController extends
}
private String[] getEntryValues() {
final Integer [] intArr = mEntriesValue.toArray(new Integer[0]);
final Integer[] intArr = mEntriesValue.toArray(new Integer[0]);
return Arrays.stream(intArr)
.map(String::valueOf)
.toArray(String[]::new);

5
src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
View File

@@ -95,8 +95,9 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
mShow5gLimitedDialog = carrierConfig.getBoolean(
CarrierConfigManager.KEY_VOLTE_5G_LIMITED_ALERT_DIALOG_BOOL);
mIsNrEnabledFromCarrierConfig = carrierConfig.getBoolean(
CarrierConfigManager.KEY_NR_ENABLED_BOOL);
mIsNrEnabledFromCarrierConfig = carrierConfig.getInt(
CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITY_INT)
!= CarrierConfigManager.CARRIER_NR_AVAILABILITY_NONE;
return this;
}

36
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -339,10 +339,10 @@ public class MobileNetworkUtils {
}
if (isWorldMode(context, subId)) {
final int settingsNetworkMode = android.provider.Settings.Global.getInt(
context.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
final int settingsNetworkMode = getNetworkTypeFromRaf(
(int) telephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
if (settingsNetworkMode == NETWORK_MODE_LTE_GSM_WCDMA
|| settingsNetworkMode == NETWORK_MODE_LTE_CDMA_EVDO
|| settingsNetworkMode == NETWORK_MODE_NR_LTE_GSM_WCDMA
@@ -368,10 +368,11 @@ public class MobileNetworkUtils {
if (isGsmBasicOptions(context, subId)) {
return true;
}
final int networkMode = android.provider.Settings.Global.getInt(
context.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
.createForSubscriptionId(subId);
final int networkMode = getNetworkTypeFromRaf(
(int) telephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
if (isWorldMode(context, subId)) {
if (networkMode == NETWORK_MODE_LTE_CDMA_EVDO
|| networkMode == NETWORK_MODE_LTE_GSM_WCDMA
@@ -435,10 +436,9 @@ public class MobileNetworkUtils {
return false;
}
final int networkMode = android.provider.Settings.Global.getInt(
context.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
final int networkMode = getNetworkTypeFromRaf(
(int) telephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
&& isWorldMode(context, subId)) {
return false;
@@ -550,15 +550,17 @@ public class MobileNetworkUtils {
*/
@VisibleForTesting
static boolean shouldSpeciallyUpdateGsmCdma(Context context, int subId) {
final int networkMode = android.provider.Settings.Global.getInt(
context.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
.createForSubscriptionId(subId);
final int networkMode = getNetworkTypeFromRaf(
(int) telephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM
|| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA
|| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA
|| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA
|| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA
|| networkMode
== TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA
|| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA) {
if (!isTdscdmaSupported(context, subId) && isWorldMode(context, subId)) {
return true;

16
src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java
View File

@@ -20,8 +20,6 @@ import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.telephony.SubscriptionManager;
import androidx.lifecycle.Lifecycle;
@@ -29,7 +27,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import com.android.settings.network.PreferredNetworkModeContentObserver;
import com.android.settings.network.AllowedNetworkTypesListener;
import com.android.settings.widget.PreferenceCategoryController;
/**
@@ -39,15 +37,15 @@ public class NetworkPreferenceCategoryController extends PreferenceCategoryContr
implements LifecycleObserver {
private PreferenceScreen mPreferenceScreen;
private PreferredNetworkModeContentObserver mPreferredNetworkModeObserver;
private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
protected int mSubId;
public NetworkPreferenceCategoryController(Context context, String key) {
super(context, key);
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
mPreferredNetworkModeObserver = new PreferredNetworkModeContentObserver(
new Handler(Looper.getMainLooper()));
mPreferredNetworkModeObserver.setPreferredNetworkModeChangedListener(
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
context.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
() -> updatePreference());
}
@@ -57,12 +55,12 @@ public class NetworkPreferenceCategoryController extends PreferenceCategoryContr
@OnLifecycleEvent(ON_START)
public void onStart() {
mPreferredNetworkModeObserver.register(mContext, mSubId);
mAllowedNetworkTypesListener.register(mContext, mSubId);
}
@OnLifecycleEvent(ON_STOP)
public void onStop() {
mPreferredNetworkModeObserver.unregister(mContext);
mAllowedNetworkTypesListener.unregister(mContext, mSubId);
}
@Override

19
src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.network.telephony;
import android.content.Context;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -80,17 +79,13 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
public boolean onPreferenceChange(Preference preference, Object object) {
final int newPreferredNetworkMode = Integer.parseInt((String) object);
if (mTelephonyManager.setPreferredNetworkTypeBitmask(
MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode))) {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
newPreferredNetworkMode);
mTelephonyManager.setAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
MobileNetworkUtils.getRafFromNetworkType(newPreferredNetworkMode));
final ListPreference listPreference = (ListPreference) preference;
listPreference.setSummary(getPreferredNetworkModeSummaryResId(newPreferredNetworkMode));
return true;
}
return false;
}
public void init(int subId) {
@@ -104,9 +99,9 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
}
private int getPreferredNetworkMode() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
return MobileNetworkUtils.getNetworkTypeFromRaf(
(int) mTelephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
}
private int getPreferredNetworkModeSummaryResId(int NetworkMode) {

56
src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java
View File

@@ -17,11 +17,6 @@
package com.android.settings.network.telephony.cdma;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -29,6 +24,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import com.android.settings.network.AllowedNetworkTypesListener;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.TelephonyBasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -44,22 +40,25 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen
protected Preference mPreference;
protected TelephonyManager mTelephonyManager;
protected PreferenceManager mPreferenceManager;
private DataContentObserver mDataContentObserver;
private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
public CdmaBasePreferenceController(Context context, String key) {
super(context, key);
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
mDataContentObserver = new DataContentObserver(new Handler(Looper.getMainLooper()));
}
@Override
public void onStart() {
mDataContentObserver.register(mContext, mSubId);
if (mAllowedNetworkTypesListener != null) {
mAllowedNetworkTypesListener.register(mContext, mSubId);
}
}
@Override
public void onStop() {
mDataContentObserver.unRegister(mContext);
if (mAllowedNetworkTypesListener != null) {
mAllowedNetworkTypesListener.unregister(mContext, mSubId);
}
}
@Override
@@ -74,12 +73,25 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen
mSubId = subId;
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
if (mAllowedNetworkTypesListener == null) {
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
mContext.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
() -> updatePreference());
}
}
public void init(int subId) {
init(null, subId);
}
private void updatePreference() {
if (mPreference != null) {
updateState(mPreference);
}
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
@@ -88,30 +100,4 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen
((CdmaListPreference) mPreference).setSubId(mSubId);
}
}
/**
* Listener that listens to mobile data state change.
*/
public class DataContentObserver extends ContentObserver {
public DataContentObserver(Handler handler) {
super(handler);
}
@Override
public void onChange(boolean selfChange) {
super.onChange(selfChange);
updateState(mPreference);
}
public void register(Context context, int subId) {
final Uri uri = Settings.Global.getUriFor(
Settings.Global.PREFERRED_NETWORK_MODE + subId);
context.getContentResolver().registerContentObserver(uri, false, this);
}
public void unRegister(Context context) {
context.getContentResolver().unregisterContentObserver(this);
}
}
}

10
src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
View File

@@ -26,6 +26,8 @@ import android.telephony.TelephonyManager;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.network.telephony.MobileNetworkUtils;
/**
* Preference controller for "System Select"
*/
@@ -50,10 +52,10 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
resetCdmaRoamingModeToDefault();
}
}
final int settingsNetworkMode = Settings.Global.getInt(
mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
final int settingsNetworkMode = MobileNetworkUtils.getNetworkTypeFromRaf(
(int) mTelephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
final boolean enableList = settingsNetworkMode != NETWORK_MODE_LTE_GSM_WCDMA
&& settingsNetworkMode != NETWORK_MODE_NR_LTE_GSM_WCDMA;
listPreference.setEnabled(enableList);

14
src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.Looper;
import android.os.PersistableBundle;
import android.os.SystemClock;
@@ -43,7 +44,7 @@ import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.network.PreferredNetworkModeContentObserver;
import com.android.settings.network.AllowedNetworkTypesListener;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.NetworkSelectSettings;
import com.android.settings.network.telephony.TelephonyTogglePreferenceController;
@@ -62,7 +63,7 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
private final Handler mUiHandler;
private PreferenceScreen mPreferenceScreen;
private PreferredNetworkModeContentObserver mPreferredNetworkModeObserver;
private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
private TelephonyManager mTelephonyManager;
private boolean mOnlyAutoSelectInHome;
private List<OnNetworkSelectModeListener> mListeners;
@@ -77,8 +78,9 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
mListeners = new ArrayList<>();
mUiHandler = new Handler(Looper.getMainLooper());
mPreferredNetworkModeObserver = new PreferredNetworkModeContentObserver(mUiHandler);
mPreferredNetworkModeObserver.setPreferredNetworkModeChangedListener(
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
new HandlerExecutor(mUiHandler));
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
() -> updatePreference());
}
@@ -93,12 +95,12 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
@OnLifecycleEvent(ON_START)
public void onStart() {
mPreferredNetworkModeObserver.register(mContext, mSubId);
mAllowedNetworkTypesListener.register(mContext, mSubId);
}
@OnLifecycleEvent(ON_STOP)
public void onStop() {
mPreferredNetworkModeObserver.unregister(mContext);
mAllowedNetworkTypesListener.unregister(mContext, mSubId);
}
@Override

16
src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
View File

@@ -22,8 +22,6 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
@@ -38,7 +36,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.network.PreferredNetworkModeContentObserver;
import com.android.settings.network.AllowedNetworkTypesListener;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.NetworkSelectSettings;
import com.android.settings.network.telephony.TelephonyBasePreferenceController;
@@ -54,15 +52,15 @@ public class OpenNetworkSelectPagePreferenceController extends
private TelephonyManager mTelephonyManager;
private Preference mPreference;
private PreferenceScreen mPreferenceScreen;
private PreferredNetworkModeContentObserver mPreferredNetworkModeObserver;
private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
public OpenNetworkSelectPagePreferenceController(Context context, String key) {
super(context, key);
mTelephonyManager = context.getSystemService(TelephonyManager.class);
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
mPreferredNetworkModeObserver = new PreferredNetworkModeContentObserver(
new Handler(Looper.getMainLooper()));
mPreferredNetworkModeObserver.setPreferredNetworkModeChangedListener(
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
context.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
() -> updatePreference());
}
@@ -85,12 +83,12 @@ public class OpenNetworkSelectPagePreferenceController extends
@OnLifecycleEvent(ON_START)
public void onStart() {
mPreferredNetworkModeObserver.register(mContext, mSubId);
mAllowedNetworkTypesListener.register(mContext, mSubId);
}
@OnLifecycleEvent(ON_STOP)
public void onStop() {
mPreferredNetworkModeObserver.unregister(mContext);
mAllowedNetworkTypesListener.unregister(mContext, mSubId);
}
@Override