summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2013-02-04 19:22:47 -0800
committer Mathias Agopian <mathias@google.com> 2013-02-04 19:22:47 -0800
commit7f84c065fa1615ee9afb5c229ec9b9319ab88920 (patch)
treea107726f7898040c061d1334648da07ad1f2e695
parent58395e71ce7e99f8149eebbf39db77798165a539 (diff)
allow the framework to access a Sensor's handle
this is needed in another CL to fix an issue where sensors power usage is always reported as 0. Change-Id: Ie496b98bf4b7e69911bdc99bee14cc924e1d71e8
-rw-r--r--core/java/android/hardware/Sensor.java3
-rw-r--r--core/java/android/os/BatteryStats.java5
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index e0c9d2c9c436..41384d2209c1 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -194,7 +194,8 @@ public final class Sensor {
return mMinDelay;
}
- int getHandle() {
+ /** @hide */
+ public int getHandle() {
return mHandle;
}
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index abbb6a1a5c4e..499ec77e3d09 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -301,6 +301,11 @@ public abstract class BatteryStats implements Parcelable {
public abstract int getUserActivityCount(int type, int which);
public static abstract class Sensor {
+ /*
+ * FIXME: it's not correct to use this magic value because it
+ * could clash with a sensor handle (which are defined by
+ * the sensor HAL, and therefore out of our control
+ */
// Magic sensor number for the GPS.
public static final int GPS = -10000;