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

Replace @hide API with public API

Browse Source 
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.

Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d

Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
This commit is contained in:
Aaron Huang
2021-02-01 18:48:33 +08:00
parent ffccb8a611
commit 3bb961affd
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) {