Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolved conflicts for merge of ec52c98d to master"

Browse Source
This commit is contained in:
Robert Greenwalt
2010-09-09 13:37:42 -07:00
committed by Android (Google) Code Review
parent a8fe56adda ca4306c976
commit 29c1ac170e
6 changed files with 262 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/net/ConnectivityManager.java
View File

@@ -105,6 +105,14 @@ public class ConnectivityManager
* it with {@link android.content.Intent#getStringExtra(String)}.
*/
public static final String EXTRA_EXTRA_INFO = "extraInfo";
/**
* The lookup key for an int that provides information about
* our connection to the internet at large. 0 indicates no connection,
* 100 indicates a great connection. Retrieve it with
* {@link android.content.Intent@getIntExtra(String)}.
* {@hide}
*/
public static final String EXTRA_INET_CONDITION = "inetCondition";
/**
* Broadcast Action: The setting for background data usage has changed
@@ -575,4 +583,16 @@ public class ConnectivityManager
return false;
}
}
/*
* @param networkType The type of network you want to report on
* @param percentage The quality of the connection 0 is bad, 100 is good
* {@hide}
*/
public void reportInetCondition(int networkType, int percentage) {
try {
mService.reportInetCondition(networkType, percentage);
} catch (RemoteException e) {
}
}
}

2
core/java/android/net/IConnectivityManager.aidl
View File

@@ -78,4 +78,6 @@ interface IConnectivityManager
String[] getTetherableBluetoothRegexs();
void requestNetworkTransitionWakelock(in String forWhom);
void reportInetCondition(int networkType, int percentage);
}

12
core/java/android/net/NetworkStateTracker.java
View File

@@ -70,6 +70,18 @@ public interface NetworkStateTracker {
*/
public static final int EVENT_CLEAR_NET_TRANSITION_WAKELOCK = 7;
/**
* msg.arg1 = network type
* msg.arg2 = condition (0 bad, 100 good)
*/
public static final int EVENT_INET_CONDITION_CHANGE = 8;
/**
* msg.arg1 = network type
* msg.arg2 = default connection sequence number
*/
public static final int EVENT_INET_CONDITION_HOLD_END = 9;
/**
* -------------------------------------------------------------
* Control Interface

15
core/java/android/provider/Settings.java
View File

@@ -3471,6 +3471,21 @@ public final class Settings {
public static final String DOWNLOAD_MAX_BYTES_OVER_MOBILE =
"download_manager_max_bytes_over_mobile";
/**
* ms during which to consume extra events related to Inet connection condition
* after a transtion to fully-connected
* @hide
*/
public static final String INET_CONDITION_DEBOUNCE_UP_DELAY =
"inet_condition_debounce_up_delay";
/**
* ms during which to consume extra events related to Inet connection condtion
* after a transtion to partly-connected
* @hide
*/
public static final String INET_CONDITION_DEBOUNCE_DOWN_DELAY =
"inet_condition_debounce_down_delay";
/**
* @hide