Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d89d2b5 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am adeadda2: am caaeda95: Merge "Add a toString() method to Sensor for... 

am adeadda2: am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev

* commit 'adeadda2':
  Add a toString() method to Sensor for debugging purposes.
parents 6e5a4946 adeadda2

api/17.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

























api/current.txt



+1
−1






























Original line number
Diff line number
Diff line








@@ -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();

























core/java/android/hardware/Sensor.java



+8
−1






























Original line number
Diff line number
Diff line








@@ -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 + "}";













    }















}