diff options
| author | 2012-08-13 23:14:55 -0700 | |
|---|---|---|
| committer | 2012-08-13 23:14:56 -0700 | |
| commit | caaeda955bd80df9d9ab310e7ab504865a2e32e9 (patch) | |
| tree | cf24d8c7011f7a70af34bcedcac3714b0bd9bc22 | |
| parent | 510cff946874b8408664c86f9935d6a38f770e82 (diff) | |
| parent | 6a2ef12753e5fa199463e36e23c6af9df0666093 (diff) | |
Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev
| -rw-r--r-- | api/17.txt | 2 | ||||
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/Sensor.java | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/api/17.txt b/api/17.txt index 984b844c1e6d..c43802f89d49 100644 --- a/api/17.txt +++ b/api/17.txt @@ -9802,7 +9802,7 @@ package android.hardware { method public float getZ(); } - public class Sensor { + public final class Sensor { method public float getMaximumRange(); method public int getMinDelay(); method public java.lang.String getName(); diff --git a/api/current.txt b/api/current.txt index da3dd3edc8b9..2c69beed6266 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9848,7 +9848,7 @@ package android.hardware { method public float getZ(); } - public class Sensor { + public final class Sensor { method public float getMaximumRange(); method public int getMinDelay(); method public java.lang.String getName(); diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index 3c70dc69886d..e0c9d2c9c436 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -26,7 +26,7 @@ package android.hardware; * @see SensorEvent * */ -public class Sensor { +public final class Sensor { /** * A constant describing an accelerometer sensor type. See @@ -202,4 +202,11 @@ public class Sensor { mMaxRange = max; mResolution = res; } + + @Override + public String toString() { + return "{Sensor name=\"" + mName + "\", vendor=\"" + mVendor + "\", version=" + mVersion + + ", type=" + mType + ", maxRange=" + mMaxRange + ", resolution=" + mResolution + + ", power=" + mPower + ", minDelay=" + mMinDelay + "}"; + } } |