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

Revert "[Settings] Support getSystemService(Class<T>)"

Browse Source 
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
This commit is contained in:
Bonian Chen
2021-03-30 00:51:15 +00:00
parent d5ccde31a8
commit 234b698fb2
63 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/ChangeWifiStateDetails.java
View File

@@ -49,7 +49,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader
super.onCreate(savedInstanceState);
final Context context = getActivity();
mAppBridge = new AppStateChangeWifiStateBridge(context, mState, null);
mAppOpsManager = context.getSystemService(AppOpsManager.class);
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
// find preferences
addPreferencesFromResource(R.xml.change_wifi_state_details);

2
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -69,7 +69,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final WifiManager wifiManager = getSystemService(WifiManager.class);
final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new WifiP2pPreferenceController(context, getSettingsLifecycle(),
wifiManager));

2
src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
View File

@@ -51,7 +51,7 @@ public class UseOpenWifiPreferenceController extends TogglePreferenceController
super(context, KEY_USE_OPEN_WIFI_AUTOMATICALLY);
mContentResolver = context.getContentResolver();
mNetworkScoreManager =
context.getSystemService(NetworkScoreManager.class);
(NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
mSettingObserver = new SettingObserver();
updateEnableUseWifiComponentName();
checkForFeatureSupportedScorers();

2
src/com/android/settings/wifi/WifiAPITest.java
View File

@@ -64,7 +64,7 @@ public class WifiAPITest extends SettingsPreferenceFragment implements
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mWifiManager = getSystemService(WifiManager.class);
mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
}
@Override

2
src/com/android/settings/wifi/WifiConfigInfo.java
View File

@@ -38,7 +38,7 @@ public class WifiConfigInfo extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mWifiManager = getSystemService(WifiManager.class);
mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
setContentView(R.layout.wifi_config_info);
mConfigList = (TextView) findViewById(R.id.config_list);
}

4
src/com/android/settings/wifi/WifiEnabler.java
View File

@@ -75,7 +75,7 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene
public WifiEnabler(Context context, SwitchWidgetController switchWidget,
MetricsFeatureProvider metricsFeatureProvider) {
this(context, switchWidget, metricsFeatureProvider,
context.getSystemService(ConnectivityManager.class));
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE));
}
@VisibleForTesting
@@ -86,7 +86,7 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene
mSwitchWidget = switchWidget;
mSwitchWidget.setListener(this);
mMetricsFeatureProvider = metricsFeatureProvider;
mWifiManager = context.getSystemService(WifiManager.class);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mConnectivityManager = connectivityManager;
mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);

2
src/com/android/settings/wifi/WifiNoInternetDialog.java
View File

@@ -107,7 +107,7 @@ public class WifiNoInternetDialog extends AlertActivity implements
}
};
mCM = getSystemService(ConnectivityManager.class);
mCM = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
mCM.registerNetworkCallback(request, mNetworkCallback);
final NetworkInfo ni = mCM.getNetworkInfo(mNetwork);

2
src/com/android/settings/wifi/WifiStatusTest.java
View File

@@ -116,7 +116,7 @@ public class WifiStatusTest extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mWifiManager = getSystemService(WifiManager.class);
mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
mWifiStateFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
mWifiStateFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

2
src/com/android/settings/wifi/WifiUtils.java
View File

@@ -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 = context.getSystemService(UserManager.class);
final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
// Check if device has DPM capability. If it has and dpm is still null, then we
// treat this case with suspicion and bail out.

2
src/com/android/settings/wifi/WifiWakeupPreferenceController.java
View File

@@ -73,7 +73,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
public WifiWakeupPreferenceController(Context context) {
super(context, KEY_ENABLE_WIFI_WAKEUP);
mLocationManager = context.getSystemService(LocationManager.class);
mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE);
mWifiManager = context.getSystemService(WifiManager.class);
}

8
src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
View File

@@ -128,8 +128,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
boolean isWfcModeEditable = true;
boolean isWfcRoamingModeEditable = false;
final CarrierConfigManager configManager =
activity.getSystemService(CarrierConfigManager.class);
final CarrierConfigManager configManager = (CarrierConfigManager)
activity.getSystemService(Context.CARRIER_CONFIG_SERVICE);
if (configManager != null) {
PersistableBundle b =
configManager.getConfigForSubId(WifiCallingSettingsForSub.this.mSubId);
@@ -343,8 +343,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
return;
}
final CarrierConfigManager configManager =
getSystemService(CarrierConfigManager.class);
final CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
boolean isWifiOnlySupported = true;
if (configManager != null) {

2
src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java
View File

@@ -42,7 +42,7 @@ public class AddDevicePreferenceController2 extends BasePreferenceController {
public AddDevicePreferenceController2(Context context) {
super(context, KEY_ADD_DEVICE);
mWifiManager = context.getSystemService(WifiManager.class);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
}
public void setWifiEntry(WifiEntry wifiEntry) {

4
src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
View File

@@ -143,8 +143,8 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements
if (admin == null) {
final DevicePolicyManager dpm = (DevicePolicyManager)
getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
final UserManager um =
getContext().getSystemService(UserManager.class);
final UserManager um = (UserManager)
getContext().getSystemService(Context.USER_SERVICE);
final int profileOwnerUserId = Utils.getManagedProfileId(
um, UserHandle.myUserId());
if (profileOwnerUserId != UserHandle.USER_NULL) {

2
src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
View File

@@ -45,7 +45,7 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
public WifiPrivacyPreferenceController2(Context context) {
super(context, KEY_WIFI_PRIVACY);
mWifiManager = context.getSystemService(WifiManager.class);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
}
public void setWifiEntry(WifiEntry wifiEntry) {

4
src/com/android/settings/wifi/dpp/WifiDppUtils.java
View File

@@ -373,8 +373,8 @@ public class WifiDppUtils {
* device security or if lock screen is unlocked
*/
public static void showLockScreen(Context context, Runnable successRunnable) {
final KeyguardManager keyguardManager = context.getSystemService(
KeyguardManager.class);
final KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(
Context.KEYGUARD_SERVICE);
if (keyguardManager.isKeyguardSecure()) {
final BiometricPrompt.AuthenticationCallback authenticationCallback =

2
src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
View File

@@ -71,7 +71,7 @@ public class WifiP2pPreferenceController extends AbstractPreferenceController
super(context);
mWifiManager = wifiManager;
lifecycle.addObserver(this);
mLocationManager = context.getSystemService(LocationManager.class);
mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE);
}
@Override

2
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -200,7 +200,7 @@ public class WifiP2pSettings extends DashboardFragment
public void onActivityCreated(Bundle savedInstanceState) {
final Activity activity = getActivity();
if (mWifiP2pManager == null) {
mWifiP2pManager = getSystemService(WifiP2pManager.class);
mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
}
if (mWifiP2pManager != null) {

2
src/com/android/settings/wifi/qrcode/QrCamera.java
View File

@@ -202,7 +202,7 @@ public class QrCamera extends Handler {
}
final WindowManager winManager =
mContext.get().getSystemService(WindowManager.class);
(WindowManager) mContext.get().getSystemService(Context.WINDOW_SERVICE);
final int rotation = winManager.getDefaultDisplay().getRotation();
int degrees = 0;
switch (rotation) {

2
src/com/android/settings/wifi/tether/TetherService.java
View File

@@ -255,7 +255,7 @@ public class TetherService extends Service {
}
private void disableTethering(final int tetheringType) {
final TetheringManager tm = getSystemService(TetheringManager.class);
final TetheringManager tm = (TetheringManager) getSystemService(Context.TETHERING_SERVICE);
tm.stopTethering(tetheringType);
}

4
src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
View File

@@ -45,8 +45,8 @@ public abstract class WifiTetherBasePreferenceController extends AbstractPrefere
OnTetherConfigUpdateListener listener) {
super(context);
mListener = listener;
mWifiManager = context.getSystemService(WifiManager.class);
mTm = context.getSystemService(TetheringManager.class);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mTm = (TetheringManager) context.getSystemService(Context.TETHERING_SERVICE);
mWifiRegexs = mTm.getTetherableWifiRegexs();
}

2
src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
View File

@@ -63,7 +63,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
boolean initSoftApManager) {
super(context);
mTetheringManager = context.getSystemService(TetheringManager.class);
mWifiManager = context.getSystemService(WifiManager.class);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mWifiRegexs = mTetheringManager.getTetherableWifiRegexs();
mLifecycle = lifecycle;
if (lifecycle != null) {

2
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -110,7 +110,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
@Override
public void onAttach(Context context) {
super.onAttach(context);
mWifiManager = context.getSystemService(WifiManager.class);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mTetherChangeReceiver = new TetherChangeReceiver();
mSSIDPreferenceController = use(WifiTetherSSIDPreferenceController.class);

4
src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
View File

@@ -73,8 +73,8 @@ public class WifiTetherSwitchBarController implements
mSwitch = mSwitchBar.getSwitch();
mDataSaverBackend = new DataSaverBackend(context);
mConnectivityManager =
context.getSystemService(ConnectivityManager.class);
mWifiManager = context.getSystemService(WifiManager.class);
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mSwitchBar.setChecked(mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED);
updateWifiSwitch();
}