Move android.settings.WIFI_SETTINGS action to Internet Settings
- Starting from S, the WiFi Settings is changed to Internet Settings - Redirect to WiFi Settings if Provider Model disabled - Don't use FLAG_ACTIVITY_NEW_TASK to avoid Lock Task Mode impacted Bug: 199364761 Bug: 198740257 Bug: 203191404 Test: manual verified by TestDPC apk (see b/198740257#comment41) Change-Id: I3c283ef58b37f4d3fe27045f431932a35af55023
This commit is contained in:
@@ -19,6 +19,8 @@ package com.android.settings.network;
|
||||
import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;
|
||||
import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
|
||||
|
||||
import static com.android.settings.Settings.WifiSettingsActivity;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Dialog;
|
||||
import android.app.settings.SettingsEnums;
|
||||
@@ -277,6 +279,17 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
@Override
|
||||
public void onCreate(Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
|
||||
final Intent intent = new Intent(getContext(), WifiSettingsActivity.class);
|
||||
final Bundle extras = getActivity().getIntent().getExtras();
|
||||
if (extras != null) {
|
||||
intent.putExtras(extras);
|
||||
}
|
||||
getContext().startActivity(intent);
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
||||
mAirplaneModeEnabler = new AirplaneModeEnabler(getContext(), this);
|
||||
|
||||
// TODO(b/37429702): Add animations and preference comparator back after initial screen is
|
||||
@@ -464,7 +477,9 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
mAirplaneModeEnabler.close();
|
||||
if (mAirplaneModeEnabler != null) {
|
||||
mAirplaneModeEnabler.close();
|
||||
}
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user