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

Commit f31cb783 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Replace @hide API with public API" am: d52cff9b am: 3178dfc7 am: 68bdb8e8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71dd0c79cdf216746d57ea6686c3d8141c721a57
parents 09010fe9 68bdb8e8

src/com/android/settings/ProxySelector.java

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.widget.TextView; 


import androidx.appcompat.app.AlertDialog;



import com.android.net.module.util.ProxyUtils;

import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;

import com.android.settings.core.InstrumentedFragment;
@@ -151,7 +152,7 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab 
        if (proxy != null) {

            hostname = proxy.getHost();

            port = proxy.getPort();

            exclList = proxy.getExclusionListAsString();

            exclList = ProxyUtils.exclusionListAsString(proxy.getExclusionList());

        }



        if (hostname == null) {

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

+3 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.widget.TextView; 


import androidx.annotation.VisibleForTesting;



import com.android.net.module.util.ProxyUtils;

import com.android.settings.ProxySelector;

import com.android.settings.R;

import com.android.settings.network.SubscriptionUtil;
@@ -1408,7 +1409,8 @@ public class WifiConfigController implements TextWatcher, 
                if (proxyProperties != null) {

                    mProxyHostView.setText(proxyProperties.getHost());

                    mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));

                    mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString());

                    mProxyExclusionListView.setText(

                            ProxyUtils.exclusionListAsString(proxyProperties.getExclusionList()));

                }

            }

        } else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) {

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

+3 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import android.widget.TextView; 


import androidx.annotation.VisibleForTesting;



import com.android.net.module.util.ProxyUtils;

import com.android.settings.ProxySelector;

import com.android.settings.R;

import com.android.settings.network.SubscriptionUtil;
@@ -1372,7 +1373,8 @@ public class WifiConfigController2 implements TextWatcher, 
                if (proxyProperties != null) {

                    mProxyHostView.setText(proxyProperties.getHost());

                    mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));

                    mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString());

                    mProxyExclusionListView.setText(

                            ProxyUtils.exclusionListAsString(proxyProperties.getExclusionList()));

                }

            }

        } else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) {