diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-14 13:24:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-14 13:24:52 -0700 |
| commit | 2a5cfe519298702ef71ff8755b14f8daf6a92b2a (patch) | |
| tree | 51119ea6433cacc8b6b2b22c0bc8065005e01c58 /core/java/android/os | |
| parent | 4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4 (diff) | |
| parent | 5347bd4cda2b6afc18f8acab48e52131f35ed13c (diff) | |
| download | frameworks_base-2a5cfe519298702ef71ff8755b14f8daf6a92b2a.zip frameworks_base-2a5cfe519298702ef71ff8755b14f8daf6a92b2a.tar.gz frameworks_base-2a5cfe519298702ef71ff8755b14f8daf6a92b2a.tar.bz2 | |
Merge change 1590 into donut
* changes:
Add wifi multicast filter api (enable/disable). Fixes 1833432. Automatically re-disables any request when the app exits/crashes. Also hooked into Battery Stats for power managment analysis.
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 333ba73..8a0fd58 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -61,6 +61,13 @@ public abstract class BatteryStats implements Parcelable { */ public static final int SCAN_WIFI_LOCK = 6; + /** + * A constant indicating a wifi multicast timer + * + * {@hide} + */ + public static final int WIFI_MULTICAST_ENABLED = 7; + /** * Include all of the data in the stats, including previously saved data. */ @@ -225,9 +232,13 @@ public abstract class BatteryStats implements Parcelable { public abstract void noteFullWifiLockReleasedLocked(); public abstract void noteScanWifiLockAcquiredLocked(); public abstract void noteScanWifiLockReleasedLocked(); + public abstract void noteWifiMulticastEnabledLocked(); + public abstract void noteWifiMulticastDisabledLocked(); public abstract long getWifiTurnedOnTime(long batteryRealtime, int which); public abstract long getFullWifiLockTime(long batteryRealtime, int which); public abstract long getScanWifiLockTime(long batteryRealtime, int which); + public abstract long getWifiMulticastTime(long batteryRealtime, + int which); /** * Note that these must match the constants in android.os.LocalPowerManager. |