Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efcf1b7f authored Feb 20, 2024 by Nate Jiang

Move to new read only flag

Mainline module can only support read-only flag now

Bug: 325521253
Test: TH
Change-Id: I4514fcd21560f95084ed3c9da1a0a9b13c625c91

parent 192f95ee

src/com/android/settings/network/NetworkProviderSettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1261,7 +1261,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		WifiEntryConnectCallback callback =
		new WifiEntryConnectCallback(wifiEntry, editIfNoConfig, fullScreenEdit);

		if (Flags.wepUsage() && wifiEntry.getSecurityTypes().contains(WifiEntry.SECURITY_WEP)) {
		if (Flags.androidVWifiApi() && wifiEntry.getSecurityTypes()
		.contains(WifiEntry.SECURITY_WEP)) {
		WepNetworkDialogActivity.checkWepAllowed(
		getContext(), getViewLifecycleOwner(), wifiEntry.getSsid(), () -> {
		wifiEntry.connect(callback);

src/com/android/settings/wifi/WepNetworksPreferenceController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ class WepNetworksPreferenceController(context: Context, preferenceKey: String) :
		preference = screen.findPreference(preferenceKey)!!
		}

		override fun getAvailabilityStatus() = if (Flags.wepUsage()) AVAILABLE
		override fun getAvailabilityStatus() = if (Flags.androidVWifiApi()) AVAILABLE
		else UNSUPPORTED_ON_DEVICE

		@Composable

src/com/android/settings/wifi/WifiConfigController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ public class WifiConfigController implements TextWatcher,
		mDoNotProvideEapUserCertString =
		mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);

		if (Flags.wepUsage() && mAccessPointSecurity == WifiEntry.SECURITY_WEP) {
		if (Flags.androidVWifiApi() && mAccessPointSecurity == WifiEntry.SECURITY_WEP) {
		LinearLayout wepWarningLayout =
		(LinearLayout) mView.findViewById(R.id.wep_warning_layout);
		wepWarningLayout.setVisibility(View.VISIBLE);

src/com/android/settings/wifi/WifiConfigController2.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ public class WifiConfigController2 implements TextWatcher,
		mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
		mInstallCertsString = mContext.getString(R.string.wifi_install_credentials);

		if (Flags.wepUsage() && mWifiEntrySecurity == WifiEntry.SECURITY_WEP) {
		if (Flags.androidVWifiApi() && mWifiEntrySecurity == WifiEntry.SECURITY_WEP) {
		LinearLayout wepWarningLayout =
		(LinearLayout) mView.findViewById(R.id.wep_warning_layout);
		wepWarningLayout.setVisibility(View.VISIBLE);