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

Commit d52cff9b authored by Aaron Huang's avatar Aaron Huang Committed by Gerrit Code Review
Browse files

Merge "Replace @hide API with public API"

parents cf231cad 3bb961af

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
@@ -69,6 +69,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.wifi.details.WifiPrivacyPreferenceController;
@@ -1428,7 +1429,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
@@ -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.wifi.details.WifiPrivacyPreferenceController;
@@ -1410,7 +1411,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) {