From 0d25534fed91f636def5776ddc4605005bd7471c Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Wed, 28 Jul 2010 09:35:20 -0700 Subject: Split WifiStateMachine from WifiStateTracker Notifications handled in WifiService. WifiStateTracker tracks state for connectivity service Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053 --- core/java/android/net/MobileDataStateTracker.java | 6 ------ core/java/android/net/NetworkStateTracker.java | 19 ++++++------------- 2 files changed, 6 insertions(+), 19 deletions(-) (limited to 'core/java') diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index 11cd526..efbccd2 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -526,12 +526,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { return -1; } - /** - * This is not supported. - */ - public void interpretScanResultsAvailable() { - } - @Override public String toString() { StringBuffer sb = new StringBuffer("Mobile data state: "); diff --git a/core/java/android/net/NetworkStateTracker.java b/core/java/android/net/NetworkStateTracker.java index 44215e7..82735e5 100644 --- a/core/java/android/net/NetworkStateTracker.java +++ b/core/java/android/net/NetworkStateTracker.java @@ -27,18 +27,17 @@ package android.net; public interface NetworkStateTracker { public static final int EVENT_STATE_CHANGED = 1; - public static final int EVENT_SCAN_RESULTS_AVAILABLE = 2; /** * arg1: 1 to show, 0 to hide * arg2: ID of the notification * obj: Notification (if showing) */ - public static final int EVENT_NOTIFICATION_CHANGED = 3; - public static final int EVENT_CONFIGURATION_CHANGED = 4; - public static final int EVENT_ROAMING_CHANGED = 5; - public static final int EVENT_NETWORK_SUBTYPE_CHANGED = 6; - public static final int EVENT_RESTORE_DEFAULT_NETWORK = 7; - public static final int EVENT_CLEAR_NET_TRANSITION_WAKELOCK = 8; + public static final int EVENT_NOTIFICATION_CHANGED = 2; + public static final int EVENT_CONFIGURATION_CHANGED = 3; + public static final int EVENT_ROAMING_CHANGED = 4; + public static final int EVENT_NETWORK_SUBTYPE_CHANGED = 5; + public static final int EVENT_RESTORE_DEFAULT_NETWORK = 6; + public static final int EVENT_CLEAR_NET_TRANSITION_WAKELOCK = 7; /** * Fetch NetworkInfo for the network @@ -147,10 +146,4 @@ public interface NetworkStateTracker { */ public int stopUsingNetworkFeature(String feature, int callingPid, int callingUid); - /** - * Interprets scan results. This will be called at a safe time for - * processing, and from a safe thread. - */ - public void interpretScanResultsAvailable(); - } -- cgit v1.1