diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java index 6ada11b1e69..32247dadc81 100644 --- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java @@ -55,7 +55,7 @@ public class DeviceNamePreferenceController extends BasePreferenceController public DeviceNamePreferenceController(Context context, String key) { super(context, key); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = context.getSystemService(WifiManager.class); mWifiDeviceNameTextValidator = new WifiDeviceNameTextValidator(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java index 1cae22eca90..ecd88fb5dae 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java @@ -115,7 +115,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { try { moveId = getPackageManager().movePrimaryStorage(mVolume); } catch (IllegalArgumentException e) { - StorageManager sm = (StorageManager) getSystemService(STORAGE_SERVICE); + StorageManager sm = getSystemService(StorageManager.class); if (Objects.equals(mVolume.getFsUuid(), sm.getPrimaryStorageVolume().getUuid())) { final Intent intent = new Intent(this, StorageWizardReady.class); diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java index 4af5d79c37f..fcbd5d3b769 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java +++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java @@ -146,8 +146,8 @@ public class MyDeviceInfoFragment extends DashboardFragment // TODO: There may be an avatar setting action we can use here. final int iconId = bundle.getInt("icon_id", 0); if (iconId == 0) { - final UserManager userManager = (UserManager) getActivity().getSystemService( - Context.USER_SERVICE); + final UserManager userManager = getActivity().getSystemService( + UserManager.class); final UserInfo info = Utils.getExistingUser(userManager, android.os.Process.myUserHandle()); controller.setLabel(info.name); diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java index d6cf442b11c..14e86b4475d 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java @@ -49,7 +49,7 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon public FirmwareVersionDetailPreferenceController(Context context, String key) { super(context, key); - mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); + mUserManager = mContext.getSystemService(UserManager.class); initializeAdminPermissions(); } diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index 967eea6155d..fbb29a7a981 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -49,7 +49,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { public ImeiInfoPreferenceController(Context context, String key) { super(context, key); - mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + mTelephonyManager = context.getSystemService(TelephonyManager.class); mIsMultiSim = mTelephonyManager.getPhoneCount() > 1; } diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 02c191679d1..c3917505278 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -46,9 +46,9 @@ public class SimStatusPreferenceController extends public SimStatusPreferenceController(Context context, Fragment fragment) { super(context); - mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - mSubscriptionManager = (SubscriptionManager) context.getSystemService( - Context.TELEPHONY_SUBSCRIPTION_SERVICE); + mTelephonyManager = context.getSystemService(TelephonyManager.class); + mSubscriptionManager = context.getSystemService( + SubscriptionManager.class); mFragment = fragment; } diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index a852fd69ed9..7110b97a770 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -1285,8 +1285,8 @@ public class ApnEditor extends SettingsPreferenceFragment mReadOnlyApnTypes = null; mReadOnlyApnFields = null; - final CarrierConfigManager configManager = (CarrierConfigManager) - getSystemService(Context.CARRIER_CONFIG_SERVICE); + final CarrierConfigManager configManager = + getSystemService(CarrierConfigManager.class); if (configManager != null) { final PersistableBundle b = configManager.getConfigForSubId(mSubId); if (b != null) { diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index f7617fc1fd0..71f7f766a50 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -206,8 +206,8 @@ public class ApnSettings extends RestrictedSettingsFragment mSubscriptionInfo = getSubscriptionInfo(mSubId); mTelephonyManager = activity.getSystemService(TelephonyManager.class); - final CarrierConfigManager configManager = (CarrierConfigManager) - getSystemService(Context.CARRIER_CONFIG_SERVICE); + final CarrierConfigManager configManager = + getSystemService(CarrierConfigManager.class); final PersistableBundle b = configManager.getConfigForSubId(mSubId); mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL); mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL); diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java index 06cd6a7feed..3559edb948f 100644 --- a/src/com/android/settings/network/EthernetTetherPreferenceController.java +++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java @@ -43,7 +43,7 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen super(context, preferenceKey); mEthernetRegex = context.getString( com.android.internal.R.string.config_ethernet_iface_regex); - mEthernetManager = (EthernetManager) context.getSystemService(Context.ETHERNET_SERVICE); + mEthernetManager = context.getSystemService(EthernetManager.class); } @OnLifecycleEvent(Lifecycle.Event.ON_START) diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index d8963ad9374..65439bc2065 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -73,9 +73,9 @@ public class MobilePlanPreferenceController extends AbstractPreferenceController MobilePlanPreferenceHost host) { super(context); mHost = host; - mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - mTm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); + mCm = context.getSystemService(ConnectivityManager.class); + mTm = context.getSystemService(TelephonyManager.class); + mUserManager = context.getSystemService(UserManager.class); mIsSecondaryUser = !mUserManager.isAdminUser(); } diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java index 46227f9f5a0..c873f9dffae 100644 --- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java +++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java @@ -31,7 +31,7 @@ public class NetworkResetRestrictionChecker { public NetworkResetRestrictionChecker(Context context) { mContext = context; - mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); + mUserManager = context.getSystemService(UserManager.class); } @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index 9ecab3bfb6f..011cf054d0b 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -140,6 +140,6 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen @VisibleForTesting NetworkScoreManager createNetworkScorerManager(Context context) { - return (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE); + return context.getSystemService(NetworkScoreManager.class); } } diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index 4b452c01c15..2abe3901c40 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java @@ -37,7 +37,7 @@ public class NetworkScorerPickerPreferenceController extends BasePreferenceContr public NetworkScorerPickerPreferenceController(Context context, String key) { super(context, key); mNetworkScoreManager = - (NetworkScoreManager) mContext.getSystemService(Context.NETWORK_SCORE_SERVICE); + mContext.getSystemService(NetworkScoreManager.class); } @Override diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java index 447508584ae..d001456d280 100644 --- a/src/com/android/settings/network/TetherEnabler.java +++ b/src/com/android/settings/network/TetherEnabler.java @@ -128,10 +128,10 @@ public class TetherEnabler implements SwitchWidgetController.OnSwitchChangeListe mSwitchWidgetController = switchWidgetController; mDataSaverBackend = new DataSaverBackend(context); mConnectivityManager = - (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - mTetheringManager = (TetheringManager) context.getSystemService(Context.TETHERING_SERVICE); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); + context.getSystemService(ConnectivityManager.class); + mTetheringManager = context.getSystemService(TetheringManager.class); + mWifiManager = context.getSystemService(WifiManager.class); + mUserManager = context.getSystemService(UserManager.class); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothPan = bluetoothPan; mEthernetRegex = diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 528e5c7788b..36073e18bf8 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -194,7 +194,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { super.onCreate(icicle); final Context context = getContext(); - mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); + mUserManager = context.getSystemService(UserManager.class); mTelephonyManager = context.getSystemService(TelephonyManager.class) .createForSubscriptionId(mSubId); diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index c8121c491be..588d828980a 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java @@ -106,8 +106,8 @@ public class NetworkSelectSettings extends DashboardFragment { .createForSubscriptionId(mSubId); mNetworkScanHelper = new NetworkScanHelper( mTelephonyManager, mCallback, mNetworkScanExecutor); - PersistableBundle bundle = ((CarrierConfigManager) getContext().getSystemService( - Context.CARRIER_CONFIG_SERVICE)).getConfigForSubId(mSubId); + PersistableBundle bundle = (getContext().getSystemService( + CarrierConfigManager.class)).getConfigForSubId(mSubId); if (bundle != null) { mShow4GForLTE = bundle.getBoolean( CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL); diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java index abcf621d7c6..1aacfff8ccc 100644 --- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java +++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java @@ -190,8 +190,8 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen @Override public View getView(int position, View convertView, ViewGroup parent) { - final LayoutInflater inflater = (LayoutInflater) - mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + final LayoutInflater inflater = + mContext.getSystemService(LayoutInflater.class); if (convertView == null) { convertView = inflater.inflate(mItemResId, null); diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index 8d5a3e05c44..0c98f90a111 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -104,8 +104,8 @@ public class SimSelectNotification extends BroadcastReceiver { subId = SubscriptionManager.getDefaultSmsSubscriptionId(); } - SubscriptionManager subscriptionManager = ((SubscriptionManager) context.getSystemService( - Context.TELEPHONY_SUBSCRIPTION_SERVICE)); + SubscriptionManager subscriptionManager = (context.getSystemService( + SubscriptionManager.class)); if (!subscriptionManager.isActiveSubscriptionId(subId)) { Log.w(TAG, "onEnableMmsDataRequest invalid sub ID " + subId); return; @@ -130,8 +130,8 @@ public class SimSelectNotification extends BroadcastReceiver { return; } - TelephonyManager tm = ((TelephonyManager) context.getSystemService( - Context.TELEPHONY_SERVICE)).createForSubscriptionId(subId); + TelephonyManager tm = (context.getSystemService( + TelephonyManager.class)).createForSubscriptionId(subId); if (tm.isDataEnabledForApn(TYPE_MMS)) { Log.w(TAG, "onEnableMmsDataRequest MMS data already enabled on sub ID " + subId); @@ -229,14 +229,14 @@ public class SimSelectNotification extends BroadcastReceiver { PendingIntent.FLAG_CANCEL_CURRENT); builder.setContentIntent(resultPendingIntent); NotificationManager notificationManager = - (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); + context.getSystemService(NotificationManager.class); notificationManager.createNotificationChannel(notificationChannel); notificationManager.notify(SIM_SELECT_NOTIFICATION_ID, builder.build()); } public static void cancelSimSelectNotification(Context context) { NotificationManager notificationManager = - (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); + context.getSystemService(NotificationManager.class); notificationManager.cancel(SIM_SELECT_NOTIFICATION_ID); } @@ -269,14 +269,14 @@ public class SimSelectNotification extends BroadcastReceiver { // Notify the notification. NotificationManager notificationManager = - (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); + context.getSystemService(NotificationManager.class); notificationManager.createNotificationChannel(notificationChannel); notificationManager.notify(ENABLE_MMS_NOTIFICATION_ID, builder.build()); } private void cancelEnableMmsNotification(Context context) { NotificationManager notificationManager = - (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); + context.getSystemService(NotificationManager.class); notificationManager.cancel(ENABLE_MMS_NOTIFICATION_ID); } diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 0543fee7dbe..4543f3faac9 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -319,7 +319,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment @VisibleForTesting static boolean appHasVpnPermission(Context context, @NonNull ApplicationInfo application) { final AppOpsManager service = - (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); + context.getSystemService(AppOpsManager.class); final List ops = service.getOpsForPackage(application.uid, application.packageName, new int[]{OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN}); return !ArrayUtils.isEmpty(ops); diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 7635733d77f..0b6fa911e2a 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -116,9 +116,9 @@ public class VpnSettings extends RestrictedSettingsFragment implements public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - mUserManager = (UserManager) getSystemService(Context.USER_SERVICE); - mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - mVpnManager = (VpnManager) getSystemService(Context.VPN_MANAGEMENT_SERVICE); + mUserManager = getSystemService(UserManager.class); + mConnectivityManager = getSystemService(ConnectivityManager.class); + mVpnManager = getSystemService(VpnManager.class); mUnavailable = isUiRestricted(); setHasOptionsMenu(!mUnavailable); @@ -509,7 +509,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements } // Fetch VPN-enabled apps from AppOps. - AppOpsManager aom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); + AppOpsManager aom = context.getSystemService(AppOpsManager.class); List apps = aom.getPackagesForOps(new int[] {OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN}); if (apps != null) { diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 9841615a690..4e3e62eb11c 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -49,7 +49,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader super.onCreate(savedInstanceState); final Context context = getActivity(); mAppBridge = new AppStateChangeWifiStateBridge(context, mState, null); - mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); + mAppOpsManager = context.getSystemService(AppOpsManager.class); // find preferences addPreferencesFromResource(R.xml.change_wifi_state_details); diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 3009ae72f83..c913a8d5eb4 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -68,7 +68,7 @@ public class ConfigureWifiSettings extends DashboardFragment { @Override protected List createPreferenceControllers(Context context) { - final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + final WifiManager wifiManager = getSystemService(WifiManager.class); final List controllers = new ArrayList<>(); controllers.add(new WifiP2pPreferenceController(context, getSettingsLifecycle(), wifiManager)); diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 44114e5aa75..5fa4dfb4e66 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -51,7 +51,7 @@ public class UseOpenWifiPreferenceController extends TogglePreferenceController super(context, KEY_USE_OPEN_WIFI_AUTOMATICALLY); mContentResolver = context.getContentResolver(); mNetworkScoreManager = - (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE); + context.getSystemService(NetworkScoreManager.class); mSettingObserver = new SettingObserver(); updateEnableUseWifiComponentName(); checkForFeatureSupportedScorers(); diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 15465edb04b..498539d9d6d 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -64,7 +64,7 @@ public class WifiAPITest extends SettingsPreferenceFragment implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + mWifiManager = getSystemService(WifiManager.class); } @Override diff --git a/src/com/android/settings/wifi/WifiConfigInfo.java b/src/com/android/settings/wifi/WifiConfigInfo.java index 0de306396a2..18ac2e57cd5 100644 --- a/src/com/android/settings/wifi/WifiConfigInfo.java +++ b/src/com/android/settings/wifi/WifiConfigInfo.java @@ -38,7 +38,7 @@ public class WifiConfigInfo extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + mWifiManager = getSystemService(WifiManager.class); setContentView(R.layout.wifi_config_info); mConfigList = (TextView) findViewById(R.id.config_list); } diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index dc5be4209a8..ba1ee3c2347 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -75,7 +75,7 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene public WifiEnabler(Context context, SwitchWidgetController switchWidget, MetricsFeatureProvider metricsFeatureProvider) { this(context, switchWidget, metricsFeatureProvider, - (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)); + context.getSystemService(ConnectivityManager.class)); } @VisibleForTesting @@ -86,7 +86,7 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene mSwitchWidget = switchWidget; mSwitchWidget.setListener(this); mMetricsFeatureProvider = metricsFeatureProvider; - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = context.getSystemService(WifiManager.class); mConnectivityManager = connectivityManager; mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION); diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java index 10f4c798a54..5bd9a2627e5 100644 --- a/src/com/android/settings/wifi/WifiNoInternetDialog.java +++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java @@ -102,7 +102,7 @@ public final class WifiNoInternetDialog extends AlertActivity implements } }; - mCM = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + mCM = getSystemService(ConnectivityManager.class); mCM.registerNetworkCallback(request, mNetworkCallback); final NetworkInfo ni = mCM.getNetworkInfo(mNetwork); diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java index 249cd710fd6..06242e3575b 100644 --- a/src/com/android/settings/wifi/WifiStatusTest.java +++ b/src/com/android/settings/wifi/WifiStatusTest.java @@ -116,7 +116,7 @@ public class WifiStatusTest extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + mWifiManager = getSystemService(WifiManager.class); mWifiStateFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION); mWifiStateFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index 2214605e774..04bf00233c8 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -83,7 +83,7 @@ public class WifiUtils { final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE); final PackageManager pm = context.getPackageManager(); - final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); + final UserManager um = context.getSystemService(UserManager.class); // Check if device has DPM capability. If it has and dpm is still null, then we // treat this case with suspicion and bail out. diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index e9fd35004da..3aa62b97a64 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -73,7 +73,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i public WifiWakeupPreferenceController(Context context) { super(context, KEY_ENABLE_WIFI_WAKEUP); - mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE); + mLocationManager = context.getSystemService(LocationManager.class); mWifiManager = context.getSystemService(WifiManager.class); } diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 735fecc9c9a..286e04e3e76 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -124,8 +124,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment boolean isWfcModeEditable = true; boolean isWfcRoamingModeEditable = false; - final CarrierConfigManager configManager = (CarrierConfigManager) - activity.getSystemService(Context.CARRIER_CONFIG_SERVICE); + final CarrierConfigManager configManager = + activity.getSystemService(CarrierConfigManager.class); if (configManager != null) { PersistableBundle b = configManager.getConfigForSubId(WifiCallingSettingsForSub.this.mSubId); @@ -340,8 +340,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment return; } - final CarrierConfigManager configManager = (CarrierConfigManager) - getSystemService(Context.CARRIER_CONFIG_SERVICE); + final CarrierConfigManager configManager = + getSystemService(CarrierConfigManager.class); boolean isWifiOnlySupported = true; if (configManager != null) { diff --git a/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java b/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java index 8f9741a6b34..9ab64c7a661 100644 --- a/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java +++ b/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java @@ -42,7 +42,7 @@ public class AddDevicePreferenceController2 extends BasePreferenceController { public AddDevicePreferenceController2(Context context) { super(context, KEY_ADD_DEVICE); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = context.getSystemService(WifiManager.class); } public void setWifiEntry(WifiEntry wifiEntry) { diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java index d0708eababf..6279dff246f 100644 --- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java +++ b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java @@ -140,8 +140,8 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements if (admin == null) { final DevicePolicyManager dpm = (DevicePolicyManager) getContext().getSystemService(Context.DEVICE_POLICY_SERVICE); - final UserManager um = (UserManager) - getContext().getSystemService(Context.USER_SERVICE); + final UserManager um = + getContext().getSystemService(UserManager.class); final int profileOwnerUserId = Utils.getManagedProfileId( um, UserHandle.myUserId()); if (profileOwnerUserId != UserHandle.USER_NULL) { diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java index c4849225641..72a23615249 100644 --- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java @@ -45,7 +45,7 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i public WifiPrivacyPreferenceController2(Context context) { super(context, KEY_WIFI_PRIVACY); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = context.getSystemService(WifiManager.class); } public void setWifiEntry(WifiEntry wifiEntry) { diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java index 71301d55141..02854ee2351 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java +++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java @@ -403,8 +403,8 @@ public class WifiDppUtils { * device security or if lock screen is unlocked */ public static void showLockScreen(Context context, Runnable successRunnable) { - final KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService( - Context.KEYGUARD_SERVICE); + final KeyguardManager keyguardManager = context.getSystemService( + KeyguardManager.class); if (keyguardManager.isKeyguardSecure()) { final BiometricPrompt.AuthenticationCallback authenticationCallback = diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java index 96044100647..8696bef2a62 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -71,7 +71,7 @@ public class WifiP2pPreferenceController extends AbstractPreferenceController super(context); mWifiManager = wifiManager; lifecycle.addObserver(this); - mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE); + mLocationManager = context.getSystemService(LocationManager.class); } @Override diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 9578c802ab0..0aac0bb46dc 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -200,7 +200,7 @@ public class WifiP2pSettings extends DashboardFragment public void onActivityCreated(Bundle savedInstanceState) { final Activity activity = getActivity(); if (mWifiP2pManager == null) { - mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE); + mWifiP2pManager = getSystemService(WifiP2pManager.class); } if (mWifiP2pManager != null) { diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java index 3865eb1f116..274655d45d4 100644 --- a/src/com/android/settings/wifi/qrcode/QrCamera.java +++ b/src/com/android/settings/wifi/qrcode/QrCamera.java @@ -202,7 +202,7 @@ public class QrCamera extends Handler { } final WindowManager winManager = - (WindowManager) mContext.get().getSystemService(Context.WINDOW_SERVICE); + mContext.get().getSystemService(WindowManager.class); final int rotation = winManager.getDefaultDisplay().getRotation(); int degrees = 0; switch (rotation) { diff --git a/src/com/android/settings/wifi/tether/TetherService.java b/src/com/android/settings/wifi/tether/TetherService.java index 59027193ed5..a3321bb27c7 100644 --- a/src/com/android/settings/wifi/tether/TetherService.java +++ b/src/com/android/settings/wifi/tether/TetherService.java @@ -255,7 +255,7 @@ public class TetherService extends Service { } private void disableTethering(final int tetheringType) { - final TetheringManager tm = (TetheringManager) getSystemService(Context.TETHERING_SERVICE); + final TetheringManager tm = getSystemService(TetheringManager.class); tm.stopTethering(tetheringType); } diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java index 46da097959c..a950dc312cd 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -45,8 +45,8 @@ public abstract class WifiTetherBasePreferenceController extends AbstractPrefere OnTetherConfigUpdateListener listener) { super(context); mListener = listener; - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - mTm = (TetheringManager) context.getSystemService(Context.TETHERING_SERVICE); + mWifiManager = context.getSystemService(WifiManager.class); + mTm = context.getSystemService(TetheringManager.class); mWifiRegexs = mTm.getTetherableWifiRegexs(); } diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 70b6a45eb52..1fa41b2f359 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -63,7 +63,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController boolean initSoftApManager) { super(context); mTetheringManager = context.getSystemService(TetheringManager.class); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = context.getSystemService(WifiManager.class); mWifiRegexs = mTetheringManager.getTetherableWifiRegexs(); mLifecycle = lifecycle; if (lifecycle != null) { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 2b201b17246..19baa4472cf 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -110,7 +110,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment @Override public void onAttach(Context context) { super.onAttach(context); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = context.getSystemService(WifiManager.class); mTetherChangeReceiver = new TetherChangeReceiver(); mSSIDPreferenceController = use(WifiTetherSSIDPreferenceController.class); diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 912fb8c4864..635367dc8d2 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -73,8 +73,8 @@ public class WifiTetherSwitchBarController implements mSwitch = mSwitchBar.getSwitch(); mDataSaverBackend = new DataSaverBackend(context); mConnectivityManager = - (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + context.getSystemService(ConnectivityManager.class); + mWifiManager = context.getSystemService(WifiManager.class); mSwitchBar.setChecked(mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED); updateWifiSwitch(); } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index 997c35e19e5..60eab127d3f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -181,8 +181,8 @@ public class ImeiInfoPreferenceControllerTest { mController.copy(); - final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService( - CLIPBOARD_SERVICE); + final ClipboardManager clipboard = mContext.getSystemService( + ClipboardManager.class); final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText(); assertThat(data.toString()).isEqualTo(meid); } diff --git a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java index d3a3129f4a2..53dd95917ff 100644 --- a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java @@ -57,7 +57,7 @@ public class BluetoothTetherPreferenceControllerTest { mContext = spy(ApplicationProvider.getApplicationContext()); mSwitchPreference = spy(SwitchPreference.class); - when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mContext.getSystemService(TetheringManager.class)).thenReturn(mTetheringManager); when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[] {""}); mController = new BluetoothTetherPreferenceController(mContext, "BLUETOOTH"); mController.setTetherEnabler(mTetherEnabler); diff --git a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java index 8a819087296..de642f65ab1 100644 --- a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java @@ -62,9 +62,9 @@ public class EthernetTetherPreferenceControllerTest { public void setUp() { mContext = spy(ApplicationProvider.getApplicationContext()); mPreference = spy(SwitchPreference.class); - when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mContext.getSystemService(TetheringManager.class)).thenReturn(mTetheringManager); when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX}); - when(mContext.getSystemService(Context.ETHERNET_SERVICE)).thenReturn(mEthernetManager); + when(mContext.getSystemService(EthernetManager.class)).thenReturn(mEthernetManager); mController = new EthernetTetherPreferenceController(mContext, "ethernet"); mController.setTetherEnabler(mTetherEnabler); ReflectionHelpers.setField(mController, "mEthernetRegex", ETHERNET_REGEX); diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index 8996c1d24a2..293b6493a5a 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -45,14 +45,14 @@ public class NetworkResetRestrictionCheckerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); mRestrictionChecker = spy(new NetworkResetRestrictionChecker(mContext)); } @Test public void testHasRestriction_notAdmin_shouldReturnTrue() { final Context context = mock(Context.class); - when(context.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(context.getSystemService(UserManager.class)).thenReturn(mUserManager); when(mUserManager.isAdminUser()).thenReturn(false); assertThat(mRestrictionChecker.hasRestriction()).isTrue(); diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index 390a6744d1d..fce95178567 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -125,7 +125,7 @@ public class PrivateDnsPreferenceControllerTest { mContext = spy(RuntimeEnvironment.application); mContentResolver = mContext.getContentResolver(); mShadowContentResolver = Shadow.extract(mContentResolver); - when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) + when(mContext.getSystemService(ConnectivityManager.class)) .thenReturn(mConnectivityManager); doNothing().when(mConnectivityManager).registerDefaultNetworkCallback( mCallbackCaptor.capture(), nullable(Handler.class)); diff --git a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java index bb4b0c41492..7f9ed9a21d2 100644 --- a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java @@ -95,10 +95,10 @@ public class TetherEnablerTest { AtomicReference panReference = spy(AtomicReference.class); mSwitchBar = spy(new SwitchBar(context)); mSwitchWidgetController = spy(new SwitchBarController(mSwitchBar)); - when(context.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); - when(context.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn( + when(context.getSystemService(WifiManager.class)).thenReturn(mWifiManager); + when(context.getSystemService(ConnectivityManager.class)).thenReturn( mConnectivityManager); - when(context.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(context.getSystemService(TetheringManager.class)).thenReturn(mTetheringManager); when(context.getSystemService(Context.NETWORK_POLICY_SERVICE)).thenReturn( mNetworkPolicyManager); when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]); diff --git a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java index e02da9002a9..0639ef320c0 100644 --- a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java @@ -55,7 +55,7 @@ public class UsbTetherPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(ApplicationProvider.getApplicationContext()); - when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mContext.getSystemService(TetheringManager.class)).thenReturn(mTetheringManager); when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[]{""}); mController = new UsbTetherPreferenceController(mContext, "USB"); mController.setTetherEnabler(mTetherEnabler); diff --git a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java index a82a71f18f5..22ed55cbd90 100644 --- a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java @@ -100,7 +100,7 @@ public class WifiTetherDisablePreferenceControllerTest { mContext = spy(ApplicationProvider.getApplicationContext()); mPreference = spy(SwitchPreference.class); - when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mContext.getSystemService(TetheringManager.class)).thenReturn(mTetheringManager); when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{""}); mController = new WifiTetherDisablePreferenceController(mContext, WIFI_TETHER_DISABLE_KEY); mController.setTetherEnabler(mTetherEnabler); diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java index ba37c30389a..acc6b1a2967 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java @@ -74,7 +74,7 @@ public class MobileDataSliceTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE); + doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class); doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt()); diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java index 6bee38fba9e..0d864080eb7 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java @@ -77,7 +77,7 @@ public class NetworkSelectSettingsTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager); + when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager); diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java index ecf9c68c649..66cc56a2ce6 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java @@ -66,7 +66,7 @@ public class NetworkRequestDialogActivityTest { mActivity = spy(activity); mWifiManager = mock(WifiManager.class); - when(mActivity.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); + when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index 65cc8111e36..2475d807f94 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -53,7 +53,7 @@ public class WifiEnablerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); + when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager); mEnabler = new WifiEnabler(mContext, mock(SwitchWidgetController.class), mock(MetricsFeatureProvider.class), mConnectivityManager); } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 1d13232345e..60d6b4d35c7 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -78,7 +78,7 @@ public class WifiMasterSwitchPreferenceControllerTest { when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager); mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); - when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); + when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager); when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED); } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java index b2a28db8dce..c410df62f9e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java @@ -209,7 +209,7 @@ public class WifiSettings2Test { final Resources.Theme theme = mContext.getTheme(); when(activity.getTheme()).thenReturn(theme); UserManager userManager = mock(UserManager.class); - when(activity.getSystemService(Context.USER_SERVICE)) + when(activity.getSystemService(UserManager.class)) .thenReturn(userManager); when(mWifiSettings2.findPreference(WifiSettings2.PREF_KEY_DATA_USAGE)) diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java index 8478a5471ac..3e15348c9f3 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java @@ -77,7 +77,7 @@ public class DisclaimerItemListAdapterTest { when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); when(mViewGroup.getContext()).thenReturn(mContext); - when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn( + when(mViewGroup.getContext().getSystemService(LayoutInflater.class)).thenReturn( mLayoutInflater); when(mView.findViewById(ID_DISCLAIMER_ITEM_TITLE)).thenReturn(mTestView); when(mView.findViewById(ID_DISCLAIMER_ITEM_DESCRIPTION)).thenReturn(mDescView); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java index 985edda69b5..c15e8507397 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java @@ -54,7 +54,7 @@ public class EmergencyCallLimitationDisclaimerTest { mContext = spy(RuntimeEnvironment.application); doReturn(mCarrierConfigManager).when(mContext).getSystemService( - Context.CARRIER_CONFIG_SERVICE); + CarrierConfigManager.class); when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mBundle); doReturn(getSharedPreferences()).when(mContext).getSharedPreferences(anyString(), anyInt()); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java index 3fe9678c26e..108acf8195e 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java @@ -54,7 +54,7 @@ public class LocationPolicyDisclaimerTest { mContext = spy(RuntimeEnvironment.application); doReturn(mCarrierConfigManager).when(mContext).getSystemService( - Context.CARRIER_CONFIG_SERVICE); + CarrierConfigManager.class); when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mBundle); doReturn(getSharedPreferences()).when(mContext).getSharedPreferences(anyString(), anyInt()); } diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index d777a597936..252d876c1b0 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -73,8 +73,8 @@ public class WifiTetherApBandPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); mPreference = new ListPreference(RuntimeEnvironment.application); - when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); - when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager); + when(mContext.getSystemService(TetheringManager.class)).thenReturn(mTetheringManager); when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources()); when(mScreen.findPreference(anyString())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java index 7c1939d4beb..ac73863a0f6 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -79,10 +79,10 @@ public class WifiTetherSettingsTest { MockitoAnnotations.initMocks(this); doReturn(mConnectivityManager) - .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE); - doReturn(mTetheringManager).when(mContext).getSystemService(Context.TETHERING_SERVICE); + .when(mContext).getSystemService(ConnectivityManager.class); + doReturn(mTetheringManager).when(mContext).getSystemService(TetheringManager.class); doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs(); - doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE); + doReturn(mUserManager).when(mContext).getSystemService(UserManager.class); mWifiTetherSettings = new WifiTetherSettings(); } @@ -131,7 +131,7 @@ public class WifiTetherSettingsTest { when(settings.getContext()).thenReturn(mContext); final Resources.Theme theme = mContext.getTheme(); when(activity.getTheme()).thenReturn(theme); - when(activity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager); doNothing().when(settings) .onCreatePreferences(any(Bundle.class), nullable(String.class)); final FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest(); diff --git a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java index 81841b73760..74db8c48c4b 100644 --- a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java @@ -94,7 +94,7 @@ public class EnabledNetworkModePreferenceControllerTest { when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn( mCarrierConfigManager); - when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager); + when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager); when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId( diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java index c35942afef9..f5bd86ac6bf 100644 --- a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java @@ -73,7 +73,7 @@ public class MobileDataPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(ApplicationProvider.getApplicationContext()); - doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE); + doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);