Merge "Disable log for per uid blocked status changed event" am: d66468ca25

Original change: undetermined

Change-Id: I6ba38a19e1ac1d7f3f3eccef76aa10f75273ca47
This commit is contained in:
Junyu Lai
2020-06-02 09:52:38 +00:00
committed by Automerger Merge Worker

View File

@@ -1374,10 +1374,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (nri == null || net == null || !LOGD_BLOCKED_NETWORKINFO) {
return;
}
String action = blocked ? "BLOCKED" : "UNBLOCKED";
log(String.format("Blocked status changed to %s for %d(%d) on netId %d", blocked,
nri.mUid, nri.request.requestId, net.netId));
mNetworkInfoBlockingLogs.log(action + " " + nri.mUid);
final String action = blocked ? "BLOCKED" : "UNBLOCKED";
mNetworkInfoBlockingLogs.log(String.format(
"%s %d(%d) on netId %d", action, nri.mUid, nri.request.requestId, net.netId));
}
/**