diff --git a/api/17.txt b/api/17.txt
index 984b844c1e6d5..c43802f89d49a 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 da3dd3edc8b97..2c69beed6266c 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 3c70dc69886dc..e0c9d2c9c436f 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 + "}";
+    }
 }