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

Commit b75fa30a authored by Jeff Brown's avatar Jeff Brown
Browse files

resolved conflicts for merge of aca672ba to master 

Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08
parents 3fdab65f aca672ba

api/9.xml

+34 −24
Original line number Diff line number Diff line
@@ -167608,6 +167608,38 @@ 
</parameter>

</constructor>

</class>

<class name="InputEvent"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<method name="getDeviceId"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<field name="mDeviceId"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</field>

</class>

<class name="KeyCharacterMap"

 extends="java.lang.Object"

 abstract="false"
@@ -167944,7 +167976,7 @@ 
</field>

</class>

<class name="KeyEvent"

 extends="java.lang.Object"

 extends="android.view.InputEvent"

 abstract="false"

 static="false"

 final="false"
@@ -168237,17 +168269,6 @@ 
<parameter name="c" type="int">

</parameter>

</method>

<method name="getDeviceId"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDisplayLabel"

 return="char"

 abstract="false"
@@ -171122,7 +171143,7 @@ 
</method>

</interface>

<class name="MotionEvent"

 extends="java.lang.Object"

 extends="android.view.InputEvent"

 abstract="false"

 static="false"

 final="true"
@@ -171211,17 +171232,6 @@ 
 visibility="public"

>

</method>

<method name="getDeviceId"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDownTime"

 return="long"

 abstract="false"

api/current.xml

+818 −82

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/service/wallpaper/WallpaperService.java

+6 −2

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/InputChannel.java

+6 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import android.util.Slog; 
public final class InputChannel implements Parcelable {

    private static final String TAG = "InputChannel";

    

    private static final boolean DEBUG = false;

    

    public static final Parcelable.Creator<InputChannel> CREATOR

            = new Parcelable.Creator<InputChannel>() {

        public InputChannel createFromParcel(Parcel source) {
@@ -85,7 +87,9 @@ public final class InputChannel implements Parcelable { 
            throw new IllegalArgumentException("name must not be null");

        }



        if (DEBUG) {

            Slog.d(TAG, "Opening input channel pair '" + name + "'");

        }

        return nativeOpenInputChannelPair(name);

    }

core/java/android/view/InputDevice.java

0 → 100755
+231 −0

File added.

Preview size limit exceeded, changes collapsed.