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

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

auto import from //branches/cupcake_rel/...@138607

parent c39a6e0c

api/current.xml

+147 −0
Original line number Diff line number Diff line
@@ -11018,6 +11018,56 @@ 
>

</field>

</class>

<class name="R.integer"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="R.integer"

 type="android.R.integer"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<field name="config_longAnimTime"

 type="int"

 transient="false"

 volatile="false"

 value="17694722"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="config_mediumAnimTime"

 type="int"

 transient="false"

 volatile="false"

 value="17694721"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="config_shortAnimTime"

 type="int"

 transient="false"

 volatile="false"

 value="17694720"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="R.layout"

 extends="java.lang.Object"

 abstract="false"
@@ -28374,6 +28424,17 @@ 
 visibility="public"

>

</field>

<field name="ACTION_SEARCH_LONG_PRESS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.SEARCH_LONG_PRESS&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_SEND"

 type="java.lang.String"

 transient="false"
@@ -66360,6 +66421,21 @@ 
<parameter name="c" type="android.hardware.Camera">

</parameter>

</method>

<method name="setMaxDuration"

 return="void"

 abstract="false"

 native="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">

</exception>

</method>

<method name="setOnErrorListener"

 return="void"

 abstract="false"
@@ -66373,6 +66449,19 @@ 
<parameter name="l" type="android.media.MediaRecorder.OnErrorListener">

</parameter>

</method>

<method name="setOnInfoListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.media.MediaRecorder.OnInfoListener">

</parameter>

</method>

<method name="setOutputFile"

 return="void"

 abstract="false"
@@ -66530,6 +66619,28 @@ 
 visibility="public"

>

</field>

<field name="MEDIA_RECORDER_INFO_MAX_DURATION_REACHED"

 type="int"

 transient="false"

 volatile="false"

 value="800"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MEDIA_RECORDER_INFO_UNKNOWN"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="MediaRecorder.AudioEncoder"

 extends="java.lang.Object"
@@ -66618,6 +66729,31 @@ 
</parameter>

</method>

</interface>

<interface name="MediaRecorder.OnInfoListener"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onInfo"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="mr" type="android.media.MediaRecorder">

</parameter>

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

</parameter>

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

</parameter>

</method>

</interface>

<class name="MediaRecorder.OutputFormat"

 extends="java.lang.Object"

 abstract="false"
@@ -84442,6 +84578,17 @@ 
 visibility="public"

>

</field>

<field name="EXTRA_APPLICATION_ID"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;com.android.browser.application_id&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="HISTORY_PROJECTION"

 type="java.lang.String[]"

 transient="false"

cmds/dumpstate/dumpstate.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void dumpstate(int full) { 
        /* 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);

        EXEC_TIMEOUT("dumpsys", 60);

    }

}

cmds/dumpstate/dumpstate.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 


#include <time.h>



// Commands time out after 15 seconds

#define TIMEOUT     15

// Commands time out after 60 seconds

#define TIMEOUT     60



#define PRINT(s) printf("%s\n", s)

core/java/android/app/SearchDialog.java

+8 −19
Original line number Diff line number Diff line
@@ -126,14 +126,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 


    // support for AutoCompleteTextView suggestions display

    private SuggestionsAdapter mSuggestionsAdapter;

    private Handler mHandler = new Handler();

    private Runnable mInstallSuggestionAdapter = new Runnable() {

        public void run() {

            if (mSearchTextField != null) {

                mSearchTextField.setAdapter(mSuggestionsAdapter);

            }

        }

    };



    /**

     * Constructor - fires it up and makes it look like the search UI.
@@ -262,7 +254,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
            mSearchTextField.setText(initialQuery);

        } else {

            mSuggestionsAdapter = new SuggestionsAdapter(getContext(), mSearchable, 

                    mHandler, mInstallSuggestionAdapter);

                    mSearchTextField);

            mSearchTextField.setAdapter(mSuggestionsAdapter);



            // finally, load the user's initial text (which may trigger suggestions)
@@ -1305,15 +1297,13 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        // These private variables are shared by the filter thread and must be protected

        private WeakReference<Cursor> mRecentCursor = new WeakReference<Cursor>(null);

        private boolean mNonUserQuery = false;

        private Handler mHandler;

        private Runnable mInstallSuggestionAdapter;

        private AutoCompleteTextView mParentView;



        public SuggestionsAdapter(Context context, SearchableInfo searchable,

                Handler handler, Runnable installSuggestionAdapter) {

                AutoCompleteTextView actv) {

            super(context, -1, null, null, null);

            mSearchable = searchable;

            mHandler = handler;

            mInstallSuggestionAdapter = installSuggestionAdapter;

            mParentView = actv;

            

            // set up provider resources (gives us icons, etc.)

            Context activityContext = mSearchable.getActivityContext(mContext);
@@ -1426,13 +1416,12 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
                        to = ONE_LINE_TO;

                    }

                }

                // Force the underlying ListView to discard and reload all layouts

                // (Note, this should be optimized for cases where layout/cursor remain same)

                mParentView.resetListAndClearViews();

                // Now actually set up the cursor, columns, and the list view

                changeCursorAndColumns(c, from, to);

                setViewResource(layout);          

                // Force the underlying ListView to discard and reload all layouts

                // (Note, this could be optimized for cases where layout/cursor remain same)

                mHandler.post(mInstallSuggestionAdapter);



            } else {

                // Provide some help for developers instead of just silently discarding

                Log.w(LOG_TAG, "Suggestions cursor discarded due to missing required columns.");

core/java/android/bluetooth/BluetoothHeadset.java

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ public class BluetoothHeadset { 
    /** A headset is currently connected */

    public static final int STATE_CONNECTED    = 2;



    /** A SCO audio channel is not established */

    public static final int AUDIO_STATE_DISCONNECTED = 0;

    /** A SCO audio channel is established */

    public static final int AUDIO_STATE_CONNECTED = 1;



    public static final int RESULT_FAILURE = 0;

    public static final int RESULT_SUCCESS = 1;

    /** Connection canceled before completetion. */