commit f59c7d0f2ac8d489b6d8118543a57ea4a603eacf
author Mike J. Chen <mjchen@google.com> Thu Jun 23 15:33:15 2011 -0700
committer Mike J. Chen <mjchen@google.com> Fri Jun 24 15:02:30 2011 -0700
tree fbf96a2ea9f8b13d4b89bd6cd0bb4b72be379eb3
parent 6143f5f7392fb0d3e5702a46a2415bd0ecb6efb4

Hookup interface status to other clients

After unreverting the linkstate change patch, hook up notification handlers
that didn't exist when the first patch was created, like
EthernetDataTracker.java and Vpn.java.

For the observers that handle interfaceStatusChanged(), I made
interfaceLinkStatusChanged() call it so they both do the same thing.

Change-Id: I0077e5e5f48f3932ba98f5bf363243892f2de6cc
Signed-off-by: Mike J. Chen <mjchen@google.com>

services/java/com/android/server/NetworkManagementService.java

diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index cd6ec33..e730d0d 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -154,7 +154,7 @@
     }
 
     /**
-     * Notify our observers of an interface link status change.
+     * Notify our observers of an interface link state change
      * (typically, an Ethernet cable has been plugged-in or unplugged).
      */
     private void notifyInterfaceLinkStateChanged(String iface, boolean up) {
@@ -236,7 +236,7 @@
                 } else if (cooked[2].equals("changed") && cooked.length == 5) {
                     notifyInterfaceStatusChanged(cooked[3], cooked[4].equals("up"));
                     return true;
-                } else if (cooked[2].equals("linkstatus") && cooked.length == 5) {
+                } else if (cooked[2].equals("linkstate") && cooked.length == 5) {
                     notifyInterfaceLinkStateChanged(cooked[3], cooked[4].equals("up"));
                     return true;
                 }