Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."

Browse Source 
am: af5acad9f1

Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
This commit is contained in:
Chalard Jean
2019-03-11 04:21:36 -07:00
committed by android-build-merger
parent 55fae4c14c af5acad9f1
commit d378db0b2e
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/connectivity/PacManager.java
View File

@@ -70,9 +70,8 @@ public class PacManager {
private static final long MAX_PAC_SIZE = 20 * 1000 * 1000;
// Return values for #setCurrentProxyScriptUrl
enum ToSendOrNotToSendBroadcast {
DONT_SEND_BROADCAST, DO_SEND_BROADCAST
}
public static final boolean DONT_SEND_BROADCAST = false;
public static final boolean DO_SEND_BROADCAST = true;
private String mCurrentPac;
@GuardedBy("mProxyLock")
@@ -176,11 +175,11 @@ public class PacManager {
* @param proxy Proxy information that is about to be broadcast.
* @return Returns whether the broadcast should be sent : either DO_ or DONT_SEND_BROADCAST
*/
synchronized ToSendOrNotToSendBroadcast setCurrentProxyScriptUrl(ProxyInfo proxy) {
synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {
if (!Uri.EMPTY.equals(proxy.getPacFileUrl())) {
if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) {
// Allow to send broadcast, nothing to do.
return ToSendOrNotToSendBroadcast.DO_SEND_BROADCAST;
return DO_SEND_BROADCAST;
}
mPacUrl = proxy.getPacFileUrl();
mCurrentDelay = DELAY_1;
@@ -188,7 +187,7 @@ public class PacManager {
mHasDownloaded = false;
getAlarmManager().cancel(mPacRefreshIntent);
bind();
return ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST;
return DONT_SEND_BROADCAST;
} else {
getAlarmManager().cancel(mPacRefreshIntent);
synchronized (mProxyLock) {
@@ -204,7 +203,7 @@ public class PacManager {
}
}
}
return ToSendOrNotToSendBroadcast.DO_SEND_BROADCAST;
return DO_SEND_BROADCAST;
}
}

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

@@ -208,8 +208,7 @@ public class ProxyTracker {
public void sendProxyBroadcast() {
final ProxyInfo defaultProxy = getDefaultProxy();
final ProxyInfo proxyInfo = null != defaultProxy ? defaultProxy : new ProxyInfo("", 0, "");
if (mPacManager.setCurrentProxyScriptUrl(proxyInfo)
== PacManager.ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST) {
if (mPacManager.setCurrentProxyScriptUrl(proxyInfo) == PacManager.DONT_SEND_BROADCAST) {
return;
}
if (DBG) Slog.d(TAG, "sending Proxy Broadcast for " + proxyInfo);