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

Merge "Replace @hide API with public API" am: d52cff9b57

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7897d737557abe1b7ede7f3931b2798e9610ab
This commit is contained in:
Aaron Huang
2021-02-03 08:30:43 +00:00
committed by Automerger Merge Worker
parent 3e1fb17420 d52cff9b57
commit 3178dfc76a
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ProxySelector.java
View File

@@ -41,6 +41,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.android.net.module.util.ProxyUtils;
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment; import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
@@ -151,7 +152,7 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab
if (proxy != null) { if (proxy != null) {
hostname = proxy.getHost(); hostname = proxy.getHost();
port = proxy.getPort(); port = proxy.getPort();
exclList = proxy.getExclusionListAsString(); exclList = ProxyUtils.exclusionListAsString(proxy.getExclusionList());
} }
if (hostname == null) { if (hostname == null) {

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

@@ -69,6 +69,7 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.net.module.util.ProxyUtils;
import com.android.settings.ProxySelector; import com.android.settings.ProxySelector;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.wifi.details.WifiPrivacyPreferenceController; import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
@@ -1428,7 +1429,8 @@ public class WifiConfigController implements TextWatcher,
if (proxyProperties != null) { if (proxyProperties != null) {
mProxyHostView.setText(proxyProperties.getHost()); mProxyHostView.setText(proxyProperties.getHost());
mProxyPortView.setText(Integer.toString(proxyProperties.getPort())); mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));
mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString()); mProxyExclusionListView.setText(
ProxyUtils.exclusionListAsString(proxyProperties.getExclusionList()));
} }
} }
} else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) { } else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) {

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

@@ -67,6 +67,7 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.net.module.util.ProxyUtils;
import com.android.settings.ProxySelector; import com.android.settings.ProxySelector;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.wifi.details.WifiPrivacyPreferenceController; import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
@@ -1410,7 +1411,8 @@ public class WifiConfigController2 implements TextWatcher,
if (proxyProperties != null) { if (proxyProperties != null) {
mProxyHostView.setText(proxyProperties.getHost()); mProxyHostView.setText(proxyProperties.getHost());
mProxyPortView.setText(Integer.toString(proxyProperties.getPort())); mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));
mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString()); mProxyExclusionListView.setText(
ProxyUtils.exclusionListAsString(proxyProperties.getExclusionList()));
} }
} }
} else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) { } else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) {