am 69206512: Fix some API discrepancies in InputEvent.

Merge commit '692065128e66de77470de2c50ead2bef0452952a' into gingerbread-plus-aosp

* commit '692065128e66de77470de2c50ead2bef0452952a':
  Fix some API discrepancies in InputEvent.

api/current.xml

@@ -179384,7 +179384,7 @@
  native="false"
  synchronized="false"
  static="false"
- final="true"
+ final="false"
  deprecated="not deprecated"
  visibility="public"
 >
@@ -179432,26 +179432,6 @@
  visibility="public"
 >
 </field>
-<field name="mDeviceId"
- type="int"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-</field>
-<field name="mSource"
- type="int"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-</field>
 </class>
 <class name="InputQueue"
  extends="java.lang.Object"

core/java/android/view/InputEvent.java

@@ -23,7 +23,9 @@ import android.os.Parcelable;
  * Common base class for input events.
  */
 public abstract class InputEvent implements Parcelable {
+    /** @hide */
     protected int mDeviceId;
+    /** @hide */
     protected int mSource;
     
     /** @hide */
@@ -76,7 +78,7 @@ public abstract class InputEvent implements Parcelable {
         mSource = source;
     }
     
-    public final int describeContents() {
+    public int describeContents() {
         return 0;
     }