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

Commit 9e367574 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 1555eceb 6eb5ac9c

api/current.xml

+614 −127
Original line number Diff line number Diff line
@@ -5894,39 +5894,6 @@ 
 visibility="public"

>

</field>

<field name="kraken_resource_pad62"

 type="int"

 transient="false"

 volatile="false"

 value="16843459"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad63"

 type="int"

 transient="false"

 volatile="false"

 value="16843458"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad64"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad7"

 type="int"

 transient="false"
@@ -7016,6 +6983,39 @@ 
 visibility="public"

>

</field>

<field name="overscrollFooter"

 type="int"

 transient="false"

 volatile="false"

 value="16843459"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="overscrollHeader"

 type="int"

 transient="false"

 volatile="false"

 value="16843458"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="overscrollMode"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="padding"

 type="int"

 transient="false"
@@ -44970,6 +44970,17 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="apply"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="clear"

 return="android.content.SharedPreferences.Editor"

 abstract="true"
@@ -45080,17 +45091,6 @@ 
<parameter name="key" type="java.lang.String">

</parameter>

</method>

<method name="startCommit"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</interface>

<interface name="SharedPreferences.OnSharedPreferenceChangeListener"

 abstract="true"
@@ -76023,17 +76023,6 @@ 
 visibility="public"

>

</method>

<method name="getMeteringMode"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getMinExposureCompensation"

 return="int"

 abstract="false"
@@ -76179,17 +76168,6 @@ 
 visibility="public"

>

</method>

<method name="getSupportedMeteringModes"

 return="java.util.List&lt;java.lang.String&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSupportedPictureFormats"

 return="java.util.List&lt;java.lang.Integer&gt;"

 abstract="false"
@@ -76569,19 +76547,6 @@ 
<parameter name="height" type="int">

</parameter>

</method>

<method name="setMeteringMode"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setPictureFormat"

 return="void"

 abstract="false"
@@ -77028,39 +76993,6 @@ 
 visibility="public"

>

</field>

<field name="METERING_MODE_CENTER_WEIGHTED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;center-weighted&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="METERING_MODE_FRAME_AVERAGE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;frame-average&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="METERING_MODE_SPOT"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;spot&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PREVIEW_FPS_MAX_INDEX"

 type="int"

 transient="false"
@@ -177228,14 +177160,19 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<constructor name="InputDevice"

 type="android.view.InputDevice"

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

</implements>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

</method>

<method name="getDevice"

 return="android.view.InputDevice"

 abstract="false"
@@ -177249,6 +177186,28 @@ 
<parameter name="id" type="int">

</parameter>

</method>

<method name="getDeviceIds"

 return="int[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getId"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getKeyCharacterMap"

 return="android.view.KeyCharacterMap"

 abstract="false"
@@ -177281,7 +177240,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

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

</parameter>

</method>

<method name="getName"
@@ -177306,8 +177265,8 @@ 
 visibility="public"

>

</method>

<method name="hasKey"

 return="boolean"

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"
@@ -177316,9 +177275,21 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

<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>

<field name="KEYBOARD_TYPE_ALPHABETIC"

 type="int"

 transient="false"
@@ -177647,14 +177618,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<constructor name="InputDevice.MotionRange"

 type="android.view.InputDevice.MotionRange"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="getFlat"

 return="float"

 abstract="false"
@@ -185815,6 +185778,17 @@ 
 visibility="public"

>

</method>

<method name="getOverscrollMode"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getPaddingBottom"

 return="int"

 abstract="false"
@@ -186955,6 +186929,25 @@ 
<parameter name="heightMeasureSpec" type="int">

</parameter>

</method>

<method name="onOverscrolled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

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

</parameter>

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

</parameter>

<parameter name="clampedX" type="boolean">

</parameter>

<parameter name="clampedY" type="boolean">

</parameter>

</method>

<method name="onRestoreInstanceState"

 return="void"

 abstract="false"
@@ -187108,6 +187101,35 @@ 
<parameter name="visibility" type="int">

</parameter>

</method>

<method name="overscrollBy"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

<parameter name="isTouchEvent" type="boolean">

</parameter>

</method>

<method name="performClick"

 return="boolean"

 abstract="false"
@@ -187934,6 +187956,19 @@ 
<parameter name="l" type="android.view.View.OnTouchListener">

</parameter>

</method>

<method name="setOverscrollMode"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setPadding"

 return="void"

 abstract="false"
@@ -188556,6 +188591,39 @@ 
 visibility="public"

>

</field>

<field name="OVERSCROLL_ALWAYS"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OVERSCROLL_IF_CONTENT_SCROLLS"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OVERSCROLL_NEVER"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PRESSED_ENABLED_FOCUSED_SELECTED_STATE_SET"

 type="int[]"

 transient="false"
@@ -189318,6 +189386,28 @@ 
 visibility="public"

>

</method>

<method name="getScaledOverflingDistance"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getScaledOverscrollDistance"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getScaledPagingTouchSlop"

 return="int"

 abstract="false"
@@ -203510,6 +203600,17 @@ 
 visibility="public"

>

</method>

<method name="getUseWebViewBackgroundForOverscrollBackground"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getUseWideViewPort"

 return="boolean"

 abstract="false"
@@ -204102,6 +204203,19 @@ 
<parameter name="use" type="boolean">

</parameter>

</method>

<method name="setUseWebViewBackgroundForOverscrollBackground"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="view" type="boolean">

</parameter>

</method>

<method name="setUseWideViewPort"

 return="void"

 abstract="false"
@@ -214712,6 +214826,28 @@ 
 visibility="public"

>

</method>

<method name="getOverscrollFooter"

 return="android.graphics.drawable.Drawable"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOverscrollHeader"

 return="android.graphics.drawable.Drawable"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isItemChecked"

 return="boolean"

 abstract="false"
@@ -214857,6 +214993,32 @@ 
<parameter name="itemsCanFocus" type="boolean">

</parameter>

</method>

<method name="setOverscrollFooter"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="footer" type="android.graphics.drawable.Drawable">

</parameter>

</method>

<method name="setOverscrollHeader"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="header" type="android.graphics.drawable.Drawable">

</parameter>

</method>

<method name="setSelection"

 return="void"

 abstract="false"
@@ -215428,6 +215590,331 @@ 
</parameter>

</method>

</interface>

<class name="OverScroller"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="OverScroller"

 type="android.widget.OverScroller"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

</constructor>

<constructor name="OverScroller"

 type="android.widget.OverScroller"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="interpolator" type="android.view.animation.Interpolator">

</parameter>

</constructor>

<constructor name="OverScroller"

 type="android.widget.OverScroller"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="interpolator" type="android.view.animation.Interpolator">

</parameter>

<parameter name="bounceCoefficientX" type="float">

</parameter>

<parameter name="bounceCoefficientY" type="float">

</parameter>

</constructor>

<method name="abortAnimation"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="computeScrollOffset"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="fling"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="fling"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="forceFinished"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="finished" type="boolean">

</parameter>

</method>

<method name="getCurrX"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getCurrY"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFinalX"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFinalY"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStartX"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStartY"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isFinished"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isOverscrolled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="notifyHorizontalEdgeReached"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="notifyVerticalEdgeReached"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="springback"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="startScroll"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="startScroll"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

</class>

<class name="PopupWindow"

 extends="java.lang.Object"

 abstract="false"

core/java/android/app/ContextImpl.java

+3 −11
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ import java.util.Set; 
import java.util.WeakHashMap;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.atomic.AtomicBoolean;



class ReceiverRestrictedContext extends ContextWrapper {

    ReceiverRestrictedContext(Context base) {
@@ -2821,8 +2820,6 @@ class ContextImpl extends Context { 
            private final Map<String, Object> mModified = Maps.newHashMap();

            private boolean mClear = false;



            private AtomicBoolean mCommitInFlight = new AtomicBoolean(false);



            public Editor putString(String key, String value) {

                synchronized (this) {

                    mModified.put(key, value);
@@ -2868,11 +2865,7 @@ class ContextImpl extends Context { 
                }

            }



            public void startCommit() {

                if (!mCommitInFlight.compareAndSet(false, true)) {

                    throw new IllegalStateException("can't call startCommit() twice");

                }



            public void apply() {

                final MemoryCommitResult mcr = commitToMemory();

                final Runnable awaitCommit = new Runnable() {

                        public void run() {
@@ -2888,7 +2881,6 @@ class ContextImpl extends Context { 
                Runnable postWriteRunnable = new Runnable() {

                        public void run() {

                            awaitCommit.run();

                            mCommitInFlight.set(false);

                            QueuedWork.remove(awaitCommit);

                        }

                    };
@@ -3012,13 +3004,13 @@ class ContextImpl extends Context { 
         * that they're enqueued.

         *

         * @param postWriteRunnable if non-null, we're being called

         *   from startCommit() and this is the runnable to run after

         *   from apply() and this is the runnable to run after

         *   the write proceeds.  if null (from a regular commit()),

         *   then we're allowed to do this disk write on the main

         *   thread (which in addition to reducing allocations and

         *   creating a background thread, this has the advantage that

         *   we catch them in userdebug StrictMode reports to convert

         *   them where possible to startCommit...)

         *   them where possible to apply() ...)

         */

        private void enqueueDiskWrite(final MemoryCommitResult mcr,

                                      final Runnable postWriteRunnable) {

core/java/android/content/SharedPreferences.java

+12 −12
Original line number Diff line number Diff line
@@ -54,13 +54,13 @@ public interface SharedPreferences { 
    /**

     * Interface used for modifying values in a {@link SharedPreferences}

     * object.  All changes you make in an editor are batched, and not copied

     * back to the original {@link SharedPreferences} or persistent storage

     * until you call {@link #commit}.

     * back to the original {@link SharedPreferences} until you call {@link #commit}

     * or {@link #apply}

     */

    public interface Editor {

        /**

         * Set a String value in the preferences editor, to be written back once

         * {@link #commit} is called.

         * {@link #commit} or {@link #apply} are called.

         * 

         * @param key The name of the preference to modify.

         * @param value The new value for the preference.
@@ -72,7 +72,7 @@ public interface SharedPreferences { 
        

        /**

         * Set an int value in the preferences editor, to be written back once

         * {@link #commit} is called.

         * {@link #commit} or {@link #apply} are called.

         * 

         * @param key The name of the preference to modify.

         * @param value The new value for the preference.
@@ -84,7 +84,7 @@ public interface SharedPreferences { 
        

        /**

         * Set a long value in the preferences editor, to be written back once

         * {@link #commit} is called.

         * {@link #commit} or {@link #apply} are called.

         * 

         * @param key The name of the preference to modify.

         * @param value The new value for the preference.
@@ -96,7 +96,7 @@ public interface SharedPreferences { 
        

        /**

         * Set a float value in the preferences editor, to be written back once

         * {@link #commit} is called.

         * {@link #commit} or {@link #apply} are called.

         * 

         * @param key The name of the preference to modify.

         * @param value The new value for the preference.
@@ -108,7 +108,7 @@ public interface SharedPreferences { 
        

        /**

         * Set a boolean value in the preferences editor, to be written back

         * once {@link #commit} is called.

         * once {@link #commit} or {@link #apply} are called.

         * 

         * @param key The name of the preference to modify.

         * @param value The new value for the preference.
@@ -159,7 +159,7 @@ public interface SharedPreferences { 
         *

         * <p>If you don't care about the return value and you're

         * using this from your application's main thread, consider

         * using {@link #startCommit} instead.

         * using {@link #apply} instead.

         *

         * @return Returns true if the new values were successfully written

         * to persistent storage.
@@ -173,16 +173,16 @@ public interface SharedPreferences { 
         * in the SharedPreferences.

         *

         * <p>Note that when two editors are modifying preferences at the same

         * time, the last one to call commit wins.

         * time, the last one to call apply wins.

         *

         * <p>Unlike {@link #commit}, which writes its preferences out

         * to persistent storage synchronously, {@link #startCommit}

         * to persistent storage synchronously, {@link #apply}

         * commits its changes to the in-memory

         * {@link SharedPreferences} immediately but starts an

         * asynchronous commit to disk and you won't be notified of

         * any failures.  If another editor on this

         * {@link SharedPreferences} does a regular {@link #commit}

         * while a {@link #startCommit} is still outstanding, the

         * while a {@link #apply} is still outstanding, the

         * {@link #commit} will block until all async commits are

         * completed as well as the commit itself.

         *
@@ -190,7 +190,7 @@ public interface SharedPreferences { 
         * the base class will wait for any async commits to finish in

         * its {@link android.app.Activity#onPause}.</p>

         */

        void startCommit();

        void apply();

    }



    /**

core/java/android/hardware/Camera.java

+0 −55

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/preference/Preference.java

+1 −1
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis 


    private void tryCommit(SharedPreferences.Editor editor) {

        if (mPreferenceManager.shouldCommit()) {

            editor.startCommit();

            editor.apply();

        }

    }