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

Merge "Rename one of the two EVENT_NETWORK_TESTED messages."

Browse Source
This commit is contained in:
Treehugger Robot
2022-02-21 00:22:11 +00:00
committed by Gerrit Code Review
parent 19ce06b05f 0261ced634
commit 4b654c9038
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/com/android/server/ConnectivityService.java
View File

@@ -3873,7 +3873,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
ConnectivityReportEvent reportEvent = ConnectivityReportEvent reportEvent =
new ConnectivityReportEvent(p.timestampMillis, nai, extras); new ConnectivityReportEvent(p.timestampMillis, nai, extras);
final Message m = mConnectivityDiagnosticsHandler.obtainMessage( final Message m = mConnectivityDiagnosticsHandler.obtainMessage(
ConnectivityDiagnosticsHandler.EVENT_NETWORK_TESTED, reportEvent); ConnectivityDiagnosticsHandler.CMD_SEND_CONNECTIVITY_REPORT, reportEvent);
mConnectivityDiagnosticsHandler.sendMessage(m); mConnectivityDiagnosticsHandler.sendMessage(m);
} }
@@ -9598,14 +9598,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
/** /**
* Event for {@link NetworkStateTrackerHandler} to trigger ConnectivityReport callbacks * Event for {@link NetworkStateTrackerHandler} to trigger ConnectivityReport callbacks
* after processing {@link #EVENT_NETWORK_TESTED} events. * after processing {@link #CMD_SEND_CONNECTIVITY_REPORT} events.
* obj = {@link ConnectivityReportEvent} representing ConnectivityReport info reported from * obj = {@link ConnectivityReportEvent} representing ConnectivityReport info reported from
* NetworkMonitor. * NetworkMonitor.
* data = PersistableBundle of extras passed from NetworkMonitor. * data = PersistableBundle of extras passed from NetworkMonitor.
*
* <p>See {@link ConnectivityService#EVENT_NETWORK_TESTED}.
*/ */
private static final int EVENT_NETWORK_TESTED = ConnectivityService.EVENT_NETWORK_TESTED; private static final int CMD_SEND_CONNECTIVITY_REPORT = 3;
/** /**
* Event for NetworkMonitor to inform ConnectivityService that a potential data stall has * Event for NetworkMonitor to inform ConnectivityService that a potential data stall has
@@ -9643,7 +9641,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
(IConnectivityDiagnosticsCallback) msg.obj, msg.arg1); (IConnectivityDiagnosticsCallback) msg.obj, msg.arg1);
break; break;
} }
case EVENT_NETWORK_TESTED: { case CMD_SEND_CONNECTIVITY_REPORT: {
final ConnectivityReportEvent reportEvent = final ConnectivityReportEvent reportEvent =
(ConnectivityReportEvent) msg.obj; (ConnectivityReportEvent) msg.obj;