[Settings] Replace TelephonyManager#from()

Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaListPreferenceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSubscriptionPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSystemSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: If78ad37d4795d615b6f8db2f5687a28792a6764f
This commit is contained in:
Bonian Chen
2019-12-23 04:54:51 +08:00
parent 59baff6ef9
commit 228dd34a8a
13 changed files with 25 additions and 19 deletions

View File

@@ -103,7 +103,7 @@ public class SettingsDumpService extends Service {
DataUsageController controller = new DataUsageController(this); DataUsageController controller = new DataUsageController(this);
ConnectivityManager connectivityManager = getSystemService(ConnectivityManager.class); ConnectivityManager connectivityManager = getSystemService(ConnectivityManager.class);
SubscriptionManager manager = SubscriptionManager.from(this); SubscriptionManager manager = SubscriptionManager.from(this);
TelephonyManager telephonyManager = TelephonyManager.from(this); TelephonyManager telephonyManager = this.getSystemService(TelephonyManager.class);
if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) { if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) { for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) {

View File

@@ -51,7 +51,7 @@ public abstract class DataUsageBaseFragment extends DashboardFragment {
services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager); services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager);
services.mTelephonyManager = TelephonyManager.from(context); services.mTelephonyManager = context.getSystemService(TelephonyManager.class);
services.mSubscriptionManager = SubscriptionManager.from(context); services.mSubscriptionManager = SubscriptionManager.from(context);
services.mUserManager = UserManager.get(context); services.mUserManager = UserManager.get(context);
} }

View File

@@ -33,7 +33,6 @@ import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult; import android.text.format.Formatter.BytesResult;
import android.util.Log; import android.util.Log;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@@ -72,7 +71,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
return false; return false;
} }
final TelephonyManager telephonyManager = TelephonyManager.from(context); final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
final NetworkStatsManager networkStatsManager = final NetworkStatsManager networkStatsManager =
context.getSystemService(NetworkStatsManager.class); context.getSystemService(NetworkStatsManager.class);
boolean hasEthernetUsage = false; boolean hasEthernetUsage = false;
@@ -115,7 +114,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
} }
return false; return false;
} }
final TelephonyManager tele = TelephonyManager.from(context); final TelephonyManager tele = context.getSystemService(TelephonyManager.class);
// require both supported network and ready SIM // require both supported network and ready SIM
boolean isReady = true; boolean isReady = true;
for (SubscriptionInfo subInfo : subInfoList) { for (SubscriptionInfo subInfo : subInfoList) {

View File

@@ -63,7 +63,8 @@ public class DataServiceSetupPreferenceController extends TelephonyBasePreferenc
public void init(int subId) { public void init(int subId) {
mSubId = subId; mSubId = subId;
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
} }
@Override @Override

View File

@@ -27,7 +27,6 @@ import android.os.PersistableBundle;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.RadioAccessFamily; import android.telephony.RadioAccessFamily;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
@@ -148,7 +147,8 @@ public class EnabledNetworkModePreferenceController extends
public void init(Lifecycle lifecycle, int subId) { public void init(Lifecycle lifecycle, int subId) {
mSubId = subId; mSubId = subId;
final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
final boolean isLteOnCdma = final boolean isLteOnCdma =
mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;

View File

@@ -91,7 +91,8 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon
public void init(int subId) { public void init(int subId) {
mSubId = subId; mSubId = subId;
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
} }
@Override @Override

View File

@@ -138,7 +138,8 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon
public void init(FragmentManager fragmentManager, int subId) { public void init(FragmentManager fragmentManager, int subId) {
mFragmentManager = fragmentManager; mFragmentManager = fragmentManager;
mSubId = subId; mSubId = subId;
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
} }
@VisibleForTesting @VisibleForTesting

View File

@@ -187,7 +187,8 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
final Context context = getContext(); final Context context = getContext();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mTelephonyManager = TelephonyManager.from(context).createForSubscriptionId(mSubId); mTelephonyManager = context.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
onRestoreInstance(icicle); onRestoreInstance(icicle);
} }

View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
@@ -97,7 +96,8 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
public void init(int subId) { public void init(int subId) {
mSubId = subId; mSubId = subId;
final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
final boolean isLteOnCdma = final boolean isLteOnCdma =
mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;

View File

@@ -73,7 +73,8 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen
public void init(PreferenceManager preferenceManager, int subId) { public void init(PreferenceManager preferenceManager, int subId) {
mPreferenceManager = preferenceManager; mPreferenceManager = preferenceManager;
mSubId = subId; mSubId = subId;
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
} }
public void init(int subId) { public void init(int subId) {

View File

@@ -41,6 +41,7 @@ public class CdmaListPreference extends ListPreference {
} }
public void setSubId(int subId) { public void setSubId(int subId) {
mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(subId); mTelephonyManager = getContext().getSystemService(TelephonyManager.class)
.createForSubscriptionId(subId);
} }
} }

View File

@@ -144,7 +144,8 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
public AutoSelectPreferenceController init(int subId) { public AutoSelectPreferenceController init(int subId) {
mSubId = subId; mSubId = subId;
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
final PersistableBundle carrierConfig = mContext.getSystemService( final PersistableBundle carrierConfig = mContext.getSystemService(
CarrierConfigManager.class).getConfigForSubId(mSubId); CarrierConfigManager.class).getConfigForSubId(mSubId);
mOnlyAutoSelectInHome = carrierConfig != null mOnlyAutoSelectInHome = carrierConfig != null

View File

@@ -29,7 +29,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.NetworkSelectSettings; import com.android.settings.network.telephony.NetworkSelectSettings;
@@ -100,7 +99,8 @@ public class OpenNetworkSelectPagePreferenceController extends
public OpenNetworkSelectPagePreferenceController init(int subId) { public OpenNetworkSelectPagePreferenceController init(int subId) {
mSubId = subId; mSubId = subId;
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
return this; return this;
} }