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

Commit 4df2423a authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //depot/cupcake/@136594

parent c474dec3

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/app/IUsageStats.aidl \

	core/java/com/android/internal/gadget/IGadgetService.aidl \

	core/java/com/android/internal/gadget/IGadgetHost.aidl \

    core/java/com/android/internal/os/IResultReceiver.aidl \

	core/java/com/android/internal/view/IInputContext.aidl \

	core/java/com/android/internal/view/IInputContextCallback.aidl \

	core/java/com/android/internal/view/IInputMethod.aidl \

api/current.xml

+439 −48
Original line number Diff line number Diff line
@@ -58576,19 +58576,6 @@ 
 visibility="public"

>

</constructor>

<method name="dismissSoftInput"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="getCandidatesHiddenVisibility"

 return="int"

 abstract="false"
@@ -59221,6 +59208,19 @@ 
 visibility="public"

>

</method>

<method name="requestHideSelf"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="sendDefaultEditorAction"

 return="boolean"

 abstract="false"
@@ -59426,6 +59426,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="flags" type="int">

</parameter>

<parameter name="resultReceiver" type="android.os.ResultReceiver">

</parameter>

</method>

<method name="restartInput"

 return="void"
@@ -59454,6 +59458,8 @@ 
>

<parameter name="flags" type="int">

</parameter>

<parameter name="resultReceiver" type="android.os.ResultReceiver">

</parameter>

</method>

<method name="startInput"

 return="void"
@@ -59537,6 +59543,21 @@ 
 visibility="public"

>

</method>

<method name="toggleSoftInput"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="showFlags" type="int">

</parameter>

<parameter name="hideFlags" type="int">

</parameter>

</method>

<method name="updateCursor"

 return="void"

 abstract="false"
@@ -64817,8 +64838,8 @@ 
<parameter name="loopCount" type="int">

</parameter>

</method>

<method name="setMarkerReachedListener"

 return="void"

<method name="setNotificationMarkerPosition"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -64827,10 +64848,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.media.AudioTrack.OnMarkerReachedListener">

<parameter name="markerInFrames" type="int">

</parameter>

</method>

<method name="setNotificationMarkerPosition"

<method name="setPlaybackHeadPosition"

 return="int"

 abstract="false"

 native="false"
@@ -64840,10 +64861,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="markerInFrames" type="int">

<parameter name="positionInFrames" type="int">

</parameter>

</method>

<method name="setPeriodicNotificationListener"

<method name="setPlaybackPositionUpdateListener"

 return="void"

 abstract="false"

 native="false"
@@ -64853,11 +64874,11 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.media.AudioTrack.OnPeriodicNotificationListener">

<parameter name="listener" type="android.media.AudioTrack.OnPlaybackPositionUpdateListener">

</parameter>

</method>

<method name="setPlaybackHeadPosition"

 return="int"

<method name="setPlaybackPositionUpdateListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"
@@ -64866,7 +64887,9 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="positionInFrames" type="int">

<parameter name="listener" type="android.media.AudioTrack.OnPlaybackPositionUpdateListener">

</parameter>

<parameter name="handler" type="android.os.Handler">

</parameter>

</method>

<method name="setPlaybackRate"
@@ -65103,7 +65126,7 @@ 
>

</field>

</class>

<interface name="AudioTrack.OnMarkerReachedListener"

<interface name="AudioTrack.OnPlaybackPositionUpdateListener"

 abstract="true"

 static="true"

 final="false"
@@ -65123,14 +65146,6 @@ 
<parameter name="track" type="android.media.AudioTrack">

</parameter>

</method>

</interface>

<interface name="AudioTrack.OnPeriodicNotificationListener"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onPeriodicNotification"

 return="void"

 abstract="true"
@@ -81150,6 +81165,93 @@ 
>

</constructor>

</class>

<class name="ResultReceiver"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</implements>

<constructor name="ResultReceiver"

 type="android.os.ResultReceiver"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="handler" type="android.os.Handler">

</parameter>

</constructor>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onReceiveResult"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="resultCode" type="int">

</parameter>

<parameter name="resultData" type="android.os.Bundle">

</parameter>

</method>

<method name="send"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="resultCode" type="int">

</parameter>

<parameter name="resultData" type="android.os.Bundle">

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="out" type="android.os.Parcel">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="StatFs"

 extends="java.lang.Object"

 abstract="false"
@@ -102489,6 +102591,17 @@ 
 visibility="public"

>

</field>

<field name="TYPE_TEXT_VARIATION_FILTER"

 type="int"

 transient="false"

 volatile="false"

 value="176"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TYPE_TEXT_VARIATION_LONG_MESSAGE"

 type="int"

 transient="false"
@@ -102533,6 +102646,17 @@ 
 visibility="public"

>

</field>

<field name="TYPE_TEXT_VARIATION_PHONETIC"

 type="int"

 transient="false"

 volatile="false"

 value="192"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TYPE_TEXT_VARIATION_POSTAL_ADDRESS"

 type="int"

 transient="false"
@@ -102566,7 +102690,7 @@ 
 visibility="public"

>

</field>

<field name="TYPE_TEXT_VARIATION_WEB_EDIT_TEXT"

<field name="TYPE_TEXT_VARIATION_VISIBLE_PASSWORD"

 type="int"

 transient="false"

 volatile="false"
@@ -102577,6 +102701,17 @@ 
 visibility="public"

>

</field>

<field name="TYPE_TEXT_VARIATION_WEB_EDIT_TEXT"

 type="int"

 transient="false"

 volatile="false"

 value="160"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</interface>

<class name="Layout"

 extends="java.lang.Object"
@@ -135050,6 +135185,17 @@ 
 visibility="public"

>

</field>

<field name="IME_ACTION_DONE"

 type="int"

 transient="false"

 volatile="false"

 value="5"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IME_ACTION_GO"

 type="int"

 transient="false"
@@ -135970,6 +136116,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="flags" type="int">

</parameter>

<parameter name="resultReceiver" type="android.os.ResultReceiver">

</parameter>

</method>

<method name="restartInput"

 return="void"
@@ -136026,6 +136176,8 @@ 
>

<parameter name="flags" type="int">

</parameter>

<parameter name="resultReceiver" type="android.os.ResultReceiver">

</parameter>

</method>

<method name="startInput"

 return="void"
@@ -136366,7 +136518,7 @@ 
</parameter>

</method>

<method name="hideSoftInputFromWindow"

 return="void"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"
@@ -136380,6 +136532,23 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="hideSoftInputFromWindow"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="windowToken" type="android.os.IBinder">

</parameter>

<parameter name="flags" type="int">

</parameter>

<parameter name="resultReceiver" type="android.os.ResultReceiver">

</parameter>

</method>

<method name="hideStatusIcon"

 return="void"

 abstract="false"
@@ -136509,7 +136678,22 @@ 
>

</method>

<method name="showSoftInput"

 return="void"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="view" type="android.view.View">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="showSoftInput"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"
@@ -136522,6 +136706,23 @@ 
</parameter>

<parameter name="flags" type="int">

</parameter>

<parameter name="resultReceiver" type="android.os.ResultReceiver">

</parameter>

</method>

<method name="showSoftInputFromInputMethod"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="token" type="android.os.IBinder">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="showStatusIcon"

 return="void"
@@ -136540,6 +136741,38 @@ 
<parameter name="iconId" type="int">

</parameter>

</method>

<method name="toggleSoftInput"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="showFlags" type="int">

</parameter>

<parameter name="hideFlags" type="int">

</parameter>

</method>

<method name="toggleSoftInputFromWindow"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="windowToken" type="android.os.IBinder">

</parameter>

<parameter name="showFlags" type="int">

</parameter>

<parameter name="hideFlags" type="int">

</parameter>

</method>

<method name="updateCursor"

 return="void"

 abstract="false"
@@ -136621,6 +136854,50 @@ 
 visibility="public"

>

</field>

<field name="RESULT_HIDDEN"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="RESULT_SHOWN"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="RESULT_UNCHANGED_HIDDEN"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="RESULT_UNCHANGED_SHOWN"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SHOW_FORCED"

 type="int"

 transient="false"
@@ -136724,6 +137001,21 @@ 
 visibility="public"

>

</method>

<method name="toggleSoftInput"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="showFlags" type="int">

</parameter>

<parameter name="hideFlags" type="int">

</parameter>

</method>

<method name="updateCursor"

 return="void"

 abstract="true"
@@ -138147,6 +138439,75 @@ 
</parameter>

</method>

</interface>

<class name="PluginData"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="PluginData"

 type="android.webkit.PluginData"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.InputStream">

</parameter>

<parameter name="length" type="long">

</parameter>

<parameter name="headers" type="java.util.Map&lt;java.lang.String, java.lang.String[]&gt;">

</parameter>

<parameter name="code" type="int">

</parameter>

</constructor>

<method name="getContentLength"

 return="long"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getHeaders"

 return="java.util.Map&lt;java.lang.String, java.lang.String[]&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getInputStream"

 return="java.io.InputStream"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStatusCode"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</class>

<class name="PluginList"

 extends="java.lang.Object"

 abstract="false"
@@ -138500,6 +138861,21 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="getPluginData"

 return="android.webkit.PluginData"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="url" type="java.lang.String">

</parameter>

<parameter name="headers" type="java.util.Map&lt;java.lang.String, java.lang.String&gt;">

</parameter>

</method>

<method name="service"

 return="android.webkit.CacheManager.CacheResult"

 abstract="true"
@@ -138507,7 +138883,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="url" type="java.lang.String">
@@ -138532,6 +138908,21 @@ 
 visibility="public"

>

</constructor>

<method name="getPluginData"

 return="android.webkit.PluginData"

 abstract="false"

 native="false"

 synchronized="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="url" type="java.lang.String">

</parameter>

<parameter name="headers" type="java.util.Map&lt;java.lang.String, java.lang.String&gt;">

</parameter>

</method>

<method name="getSurrogate"

 return="android.webkit.CacheManager.CacheResult"

 abstract="false"
@@ -138539,7 +138930,7 @@ 
 synchronized="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="url" type="java.lang.String">
@@ -155451,6 +155842,17 @@ 
<parameter name="depth" type="int">

</parameter>

</method>

<method name="didTouchFocusSelectAll"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="endBatchEdit"

 return="void"

 abstract="false"
@@ -157233,17 +157635,6 @@ 
<parameter name="pixels" type="int">

</parameter>

</method>

<method name="shouldAdvanceFocusOnEnter"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</method>

</class>

<class name="TextView.BufferType"

 extends="java.lang.Enum"

cmds/dumpstate/dumpstate.c

+4 −1
Original line number Diff line number Diff line
@@ -127,7 +127,10 @@ static void dumpstate(int full) { 
        PRINT("========================================================");

        PRINT("== dumpsys");

        PRINT("========================================================");

        EXEC("dumpsys");

        /* the full dumpsys is starting to take a long time, so we need

           to increase its timeout.  we really need to do the timeouts in

           dumpsys itself... */

        EXEC_TIMEOUT("dumpsys", 40);

    }

}

cmds/dumpstate/dumpstate.h

+9 −0
Original line number Diff line number Diff line
@@ -43,6 +43,15 @@ 
    run_command(&c, TIMEOUT);   \

}



#define EXEC_TIMEOUT(cmd, tmout)\

{                               \

    static struct Command c = { \

        "/system/bin/" cmd,     \

        { cmd, 0 }              \

    };                          \

    run_command(&c, tmout);     \

}



#define EXEC_XBIN(cmd)          \

{                               \

    static struct Command c = { \

core/java/android/database/sqlite/SQLiteProgram.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.util.Log; 
 * A base class for compiled SQLite programs.

 */

public abstract class SQLiteProgram extends SQLiteClosable {

    static final String TAG = "SQLiteProgram";

    private static final String TAG = "SQLiteProgram";



    /** The database this program is compiled against. */

    protected SQLiteDatabase mDatabase;