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

Commit 1715c6b6 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 4014a327 c6d7a895

api/current.xml

+7 −7
Original line number Diff line number Diff line
@@ -92922,7 +92922,7 @@ 
>

</field>

<field name="PRESET_LARGEHALL"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="5"
@@ -92933,7 +92933,7 @@ 
>

</field>

<field name="PRESET_LARGEROOM"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="3"
@@ -92944,7 +92944,7 @@ 
>

</field>

<field name="PRESET_MEDIUMHALL"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="4"
@@ -92955,7 +92955,7 @@ 
>

</field>

<field name="PRESET_MEDIUMROOM"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="2"
@@ -92966,7 +92966,7 @@ 
>

</field>

<field name="PRESET_NONE"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="0"
@@ -92977,7 +92977,7 @@ 
>

</field>

<field name="PRESET_PLATE"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="6"
@@ -92988,7 +92988,7 @@ 
>

</field>

<field name="PRESET_SMALLROOM"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="1"

core/java/android/view/LayoutInflater.java

+5 −4
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ public abstract class LayoutInflater { 
    public View inflate(XmlPullParser parser, ViewGroup root, boolean attachToRoot) {

        synchronized (mConstructorArgs) {

            final AttributeSet attrs = Xml.asAttributeSet(parser);

            Context lastContext = (Context)mConstructorArgs[0];

            mConstructorArgs[0] = mContext;

            View result = root;
@@ -432,11 +433,11 @@ public abstract class LayoutInflater { 
                        + ": " + e.getMessage());

                ex.initCause(e);

                throw ex;

            }



            // Told retain static reference on context.

            mConstructorArgs[0] = null;

            } finally {

                // Don't retain static reference on context.

                mConstructorArgs[0] = lastContext;

                mConstructorArgs[1] = null;

            }



            return result;

        }

core/java/android/widget/TextView.java

+5 −0
Original line number Diff line number Diff line
@@ -7117,6 +7117,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        int selectionStart, selectionEnd;



        // selectionModifierCursorController is not null at that point

        SelectionModifierCursorController selectionModifierCursorController =

            ((SelectionModifierCursorController) mSelectionModifierCursorController);

        int minOffset = selectionModifierCursorController.getMinTouchOffset();
@@ -7140,6 +7141,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }

    

    private String getWordForDictionary() {

        if (mSelectionModifierCursorController == null) {

            return null;

        }



        int offset = ((SelectionModifierCursorController) mSelectionModifierCursorController).

                     getMinTouchOffset();

media/java/android/media/PresetReverb.java

+7 −7
Original line number Diff line number Diff line
@@ -71,31 +71,31 @@ public class PresetReverb extends AudioEffect { 
    /**

     * No reverb or reflections

     */

    public static final int PRESET_NONE        = 0;

    public static final short PRESET_NONE        = 0;

    /**

     * Reverb preset representing a small room less than five meters in length

     */

    public static final int PRESET_SMALLROOM   = 1;

    public static final short PRESET_SMALLROOM   = 1;

    /**

     * Reverb preset representing a medium room with a length of ten meters or less

     */

    public static final int PRESET_MEDIUMROOM  = 2;

    public static final short PRESET_MEDIUMROOM  = 2;

    /**

     * Reverb preset representing a large-sized room suitable for live performances

     */

    public static final int PRESET_LARGEROOM   = 3;

    public static final short PRESET_LARGEROOM   = 3;

    /**

     * Reverb preset representing a medium-sized hall

     */

    public static final int PRESET_MEDIUMHALL  = 4;

    public static final short PRESET_MEDIUMHALL  = 4;

    /**

     * Reverb preset representing a large-sized hall suitable for a full orchestra

     */

    public static final int PRESET_LARGEHALL   = 5;

    public static final short PRESET_LARGEHALL   = 5;

    /**

     * Reverb preset representing a synthesis of the traditional plate reverb

     */

    public static final int PRESET_PLATE       = 6;

    public static final short PRESET_PLATE       = 6;



    /**

     * Registered listener for parameter changes.

media/libstagefright/MPEG4Writer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1569,9 +1569,9 @@ status_t MPEG4Writer::Track::threadEntry() { 
                // The idea here is to avoid having two or more samples with the

                // same timestamp in the output file.

                if (mTimeScale >= 1000000LL) {

                    timestampUs += 1;

                    timestampUs = lastTimestampUs + 1;

                } else {

                    timestampUs += (1000000LL + (mTimeScale >> 1)) / mTimeScale;

                    timestampUs = lastTimestampUs + (1000000LL + (mTimeScale >> 1)) / mTimeScale;

                }

#endif

            }