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 am: 3178dfc76a am: 68bdb8e8b8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71dd0c79cdf216746d57ea6686c3d8141c721a57
This commit is contained in:
Aaron Huang
2021-02-03 10:23:59 +00:00
committed by Automerger Merge Worker
parent 09010fe9f2 68bdb8e8b8
commit f31cb783da
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

@@ -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.network.SubscriptionUtil; import com.android.settings.network.SubscriptionUtil;
@@ -1408,7 +1409,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

@@ -65,6 +65,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.network.SubscriptionUtil; import com.android.settings.network.SubscriptionUtil;
@@ -1372,7 +1373,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) {