diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:15:02 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:15:02 -0700 |
| commit | 80047faad914c9b9b4966d6b58fc22800c3fcebc (patch) | |
| tree | 1e2b3ec6e7169f59641df0372fb3aa936c6a5158 /services/core/java/com/android/server/connectivity/NetworkMonitor.java | |
| parent | 7caa691652a901ac354755c44990cca11b5cdb23 (diff) | |
| parent | 557d2f54893b8da5a7e282fca6267a46d03738bf (diff) | |
| download | frameworks_base-80047faad914c9b9b4966d6b58fc22800c3fcebc.zip frameworks_base-80047faad914c9b9b4966d6b58fc22800c3fcebc.tar.gz frameworks_base-80047faad914c9b9b4966d6b58fc22800c3fcebc.tar.bz2 | |
am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release
557d2f5 Merge "Add ConnectivityManager.reportNetworkConnectivity() API" into m-wireless-dev
ab5267a Fix onLost/onFound logic in isSettingsAndFilterComboAllowed
bfd17b7 Add ConnectivityManager.reportNetworkConnectivity() API
238e0f9 OBEX Over L2CAP + SDP search API for BT profiles
31a94f4 Add ConnectivityManager.getActiveNetwork(). Rework NetID allocation in ConnectivityService so registerNetworkAgent() can return the allocated NetID.
bf18bed Merge "Non-functional code cleanup of ConnectivityService." into m-wireless-dev
db8784e Merge "Cleanup of Video Call pause functionality." into m-wireless-dev
e75b9e3 Non-functional code cleanup of ConnectivityService.
e593d0a Onfound onlost feature.
0326f58 Merge "API for config app." into m-wireless-dev
e9b056f API for config app.
d5351e7 RTT framework interface update
582b868 Unhide Network.openConnection(URL, Proxy).
0d719ca Fix typos in ConnectivityManager documentation.
Change-Id: Ib4c88f6d7ad1b24227b032555c62a5804194384b
Diffstat (limited to 'services/core/java/com/android/server/connectivity/NetworkMonitor.java')
| -rw-r--r-- | services/core/java/com/android/server/connectivity/NetworkMonitor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index d0e1665..7e20276 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -216,7 +216,7 @@ public class NetworkMonitor extends StateMachine { // If a network is not validated, make one attempt every 10 mins to see if it starts working. private static final int REEVALUATE_PAUSE_MS = 10*60*1000; private static final int PERIODIC_ATTEMPTS = 1; - // When an application calls reportBadNetwork, only make one attempt. + // When an application calls reportNetworkConnectivity, only make one attempt. private static final int REEVALUATE_ATTEMPTS = 1; private final int mReevaluateDelayMs; private int mReevaluateToken = 0; |