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

Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b am: 7272c9d036

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944

Change-Id: Ic8f685b0fb1ba4c1c2d2570b4a2a52288d087d95
This commit is contained in:
TreeHugger Robot
2021-10-28 01:08:28 +00:00
committed by Automerger Merge Worker
parent 977ae95131 7272c9d036
commit 663e79cd94
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -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;
@@ -278,6 +280,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
@@ -465,7 +478,9 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
@Override
public void onDestroy() {
mAirplaneModeEnabler.close();
if (mAirplaneModeEnabler != null) {
mAirplaneModeEnabler.close();
}
super.onDestroy();
}