LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove EXTRA_PROXY_INFO.

Browse Source 
This has been deprecated since M because it very error-prone, and
there are documented replacements.

Test: m
Bug: 171872228
Change-Id: Ide9846a26fc440b3ec5b4e4b444a046e738de3d6
This commit is contained in:
Lorenzo Colitti
2021-03-18 13:07:37 +09:00
parent c2a7e6745c
commit b612fb41de
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/android/net/ProxyInfo.java
View File

@@ -37,8 +37,9 @@ import java.util.Locale;
* Apache HTTP stack. So {@link URLConnection} and Apache's {@code HttpClient} will use
* them automatically.
*
* Other HTTP stacks will need to obtain the proxy info from
* {@link Proxy#PROXY_CHANGE_ACTION} broadcast as the extra {@link Proxy#EXTRA_PROXY_INFO}.
* Other HTTP stacks will need to obtain the proxy info by watching for the
* {@link Proxy#PROXY_CHANGE_ACTION} broadcast and calling methods such as
* {@link android.net.ConnectivityManager#getDefaultProxy}.
*/
public class ProxyInfo implements Parcelable {

7
services/core/java/com/android/server/connectivity/ProxyTracker.java
View File

@@ -55,6 +55,11 @@ public class ProxyTracker {
private static final String TAG = ProxyTracker.class.getSimpleName();
private static final boolean DBG = true;
// EXTRA_PROXY_INFO is now @removed. In order to continue sending it, hardcode its value here.
// The Proxy.EXTRA_PROXY_INFO constant is not visible to this code because android.net.Proxy
// a hidden platform constant not visible to mainline modules.
private static final String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
@NonNull
private final Context mContext;
@@ -253,7 +258,7 @@ public class ProxyTracker {
Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION);
intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING |
Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
intent.putExtra(Proxy.EXTRA_PROXY_INFO, proxyInfo);
intent.putExtra(EXTRA_PROXY_INFO, proxyInfo);
final long ident = Binder.clearCallingIdentity();
try {
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);