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

Commit 51f30b1c authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents a4d2a6c5 95d86480

api/current.xml

+98 −14
Original line number Diff line number Diff line
@@ -4024,6 +4024,17 @@ 
 visibility="public"

>

</field>

<field name="filterTouchesWhenObscured"

 type="int"

 transient="false"

 volatile="false"

 value="16843460"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="finishOnCloseSystemDialogs"

 type="int"

 transient="false"
@@ -5861,17 +5872,6 @@ 
 visibility="public"

>

</field>

<field name="kraken_resource_pad61"

 type="int"

 transient="false"

 volatile="false"

 value="16843460"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad7"

 type="int"

 transient="false"
@@ -78402,7 +78402,7 @@ 
 type="float"

 transient="false"

 volatile="false"

 value="0.001f"

 value="0.0010f"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -164852,6 +164852,29 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="formatDateRange"

 return="java.util.Formatter"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="formatter" type="java.util.Formatter">

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="formatDateTime"

 return="java.lang.String"

 abstract="false"
@@ -165345,7 +165368,7 @@ 
 value="8192"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -181662,6 +181685,17 @@ 
 visibility="public"

>

</method>

<method name="getFlags"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getHistoricalEventTime"

 return="long"

 abstract="false"
@@ -182299,6 +182333,8 @@ 
</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="obtain"

 return="android.view.MotionEvent"
@@ -182755,6 +182791,17 @@ 
 visibility="public"

>

</field>

<field name="FLAG_WINDOW_IS_OBSCURED"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="MotionEvent.PointerCoords"

 extends="java.lang.Object"
@@ -185477,6 +185524,17 @@ 
 visibility="public"

>

</method>

<method name="getFilterTouchesWhenObscured"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFocusables"

 return="java.util.ArrayList&lt;android.view.View&gt;"

 abstract="false"
@@ -186765,6 +186823,19 @@ 
<parameter name="canvas" type="android.graphics.Canvas">

</parameter>

</method>

<method name="onFilterTouchEventForSecurity"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="event" type="android.view.MotionEvent">

</parameter>

</method>

<method name="onFinishInflate"

 return="void"

 abstract="false"
@@ -187671,6 +187742,19 @@ 
<parameter name="length" type="int">

</parameter>

</method>

<method name="setFilterTouchesWhenObscured"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setFocusable"

 return="void"

 abstract="false"
@@ -225393,7 +225477,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/java/android/content/Intent.java

+24 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,30 @@ public class Intent implements Parcelable, Cloneable { 
     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";

    /**

     * Broadcast Action:  A sticky broadcast that indicates a memory full

     * condition on the device. This is intended for activities that want

     * to be able to fill the data partition completely, leaving only

     * enough free space to prevent system-wide SQLite failures.

     *

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     *

     * {@hide}

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEVICE_STORAGE_FULL = "android.intent.action.DEVICE_STORAGE_FULL";

    /**

     * Broadcast Action:  Indicates memory full condition on the device

     * no longer exists.

     *

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     *

     * {@hide}

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEVICE_STORAGE_NOT_FULL = "android.intent.action.DEVICE_STORAGE_NOT_FULL";

    /**

     * Broadcast Action:  Indicates low memory condition notification acknowledged by user

     * and package management should be started.

core/java/android/os/BatteryStats.java

+4 −2
Original line number Diff line number Diff line
@@ -1586,8 +1586,10 @@ public abstract class BatteryStats implements Parcelable { 
                        sb.append(prefix); sb.append("      CPU: ");

                                formatTime(sb, userTime); sb.append("usr + ");

                                formatTime(sb, systemTime); sb.append("krn\n");

                        if (starts != 0) {

                            sb.append(prefix); sb.append("      "); sb.append(starts);

                                    sb.append(" proc starts");

                        }

                        pw.println(sb.toString());

                        for (int e=0; e<numExcessive; e++) {

                            Uid.Proc.ExcessiveWake ew = ps.getExcessiveWake(e);

core/java/android/provider/Settings.java

+14 −5
Original line number Diff line number Diff line
@@ -2961,31 +2961,31 @@ public final class Settings { 
        public static final String WTF_IS_FATAL = "wtf_is_fatal";



        /**

         * Maximum age of entries kept by {@link android.os.IDropBox}.

         * Maximum age of entries kept by {@link com.android.internal.os.IDropBoxManagerService}.

         * @hide

         */

        public static final String DROPBOX_AGE_SECONDS =

                "dropbox_age_seconds";

        /**

         * Maximum number of entry files which {@link android.os.IDropBox} will keep around.

         * Maximum number of entry files which {@link com.android.internal.os.IDropBoxManagerService} will keep around.

         * @hide

         */

        public static final String DROPBOX_MAX_FILES =

                "dropbox_max_files";

        /**

         * Maximum amount of disk space used by {@link android.os.IDropBox} no matter what.

         * Maximum amount of disk space used by {@link com.android.internal.os.IDropBoxManagerService} no matter what.

         * @hide

         */

        public static final String DROPBOX_QUOTA_KB =

                "dropbox_quota_kb";

        /**

         * Percent of free disk (excluding reserve) which {@link android.os.IDropBox} will use.

         * Percent of free disk (excluding reserve) which {@link com.android.internal.os.IDropBoxManagerService} will use.

         * @hide

         */

        public static final String DROPBOX_QUOTA_PERCENT =

                "dropbox_quota_percent";

        /**

         * Percent of total disk which {@link android.os.IDropBox} will never dip into.

         * Percent of total disk which {@link com.android.internal.os.IDropBoxManagerService} will never dip into.

         * @hide

         */

        public static final String DROPBOX_RESERVE_PERCENT =
@@ -3044,6 +3044,15 @@ public final class Settings { 
        public static final String SYS_STORAGE_THRESHOLD_PERCENTAGE =

                "sys_storage_threshold_percentage";



        /**

         * Minimum bytes of free storage on the device before the data

         * partition is considered full. By default, 1 MB is reserved

         * to avoid system-wide SQLite disk full exceptions.

         * @hide

         */

        public static final String SYS_STORAGE_FULL_THRESHOLD_BYTES =

                "sys_storage_full_threshold_bytes";



        /**

         * The interval in milliseconds after which Wi-Fi is considered idle.

         * When idle, it is possible for the device to be switched from Wi-Fi to

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

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.IBinder;
@@ -178,6 +179,9 @@ public abstract class WallpaperService extends Service { 
        };

        

        final BaseSurfaceHolder mSurfaceHolder = new BaseSurfaceHolder() {

            {

                mRequestedFormat = PixelFormat.RGB_565;

            }



            @Override

            public boolean onAllowLockCanvas() {