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

Commit 1d369ecf authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 8de3f1f8 960b31e3

api/current.xml

+190 −90
Original line number Diff line number Diff line
@@ -21704,17 +21704,6 @@ 
 visibility="public"

>

</field>

<field name="FLAG_HEAVY_WEIGHT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IMPORTANCE_BACKGROUND"

 type="int"

 transient="false"
@@ -21825,16 +21814,6 @@ 
 visibility="public"

>

</field>

<field name="flags"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="importance"

 type="int"

 transient="false"
@@ -46525,17 +46504,6 @@ 
 visibility="public"

>

</field>

<field name="FLAG_SUPPORTS_XLARGE_SCREENS"

 type="int"

 transient="false"

 volatile="false"

 value="524288"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_SYSTEM"

 type="int"

 transient="false"
@@ -49185,6 +49153,17 @@ 
 visibility="public"

>

</field>

<field name="FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.touchscreen.multitouch.jazzhand&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_WIFI"

 type="java.lang.String"

 transient="false"
@@ -51717,17 +51696,6 @@ 
 visibility="public"

>

</field>

<field name="SCREENLAYOUT_SIZE_XLARGE"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TOUCHSCREEN_FINGER"

 type="int"

 transient="false"
@@ -265272,21 +265240,6 @@ 
 visibility="protected"

>

</method>

<method name="getOption"

 return="java.lang.Object"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<exception name="SocketException" type="java.net.SocketException">

</exception>

</method>

<method name="getOutputStream"

 return="java.io.OutputStream"

 abstract="true"
@@ -265341,23 +265294,6 @@ 
<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="setOption"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="val" type="java.lang.Object">

</parameter>

<exception name="SocketException" type="java.net.SocketException">

</exception>

</method>

<method name="setPerformancePreferences"

 return="void"

 abstract="false"
@@ -265736,19 +265672,6 @@ 
<parameter name="p" type="java.security.Permission">

</parameter>

</method>

<method name="isValidIP6Address"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

</class>

<class name="SocketTimeoutException"

 extends="java.io.InterruptedIOException"
@@ -279483,9 +279406,77 @@ 
 visibility="public"

>

</constructor>

<method name="getInstance"

 return="java.security.Policy"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="params" type="java.security.Policy.Parameters">

</parameter>

<exception name="NoSuchAlgorithmException" type="java.security.NoSuchAlgorithmException">

</exception>

</method>

<method name="getInstance"

 return="java.security.Policy"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="params" type="java.security.Policy.Parameters">

</parameter>

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

</parameter>

<exception name="NoSuchAlgorithmException" type="java.security.NoSuchAlgorithmException">

</exception>

<exception name="NoSuchProviderException" type="java.security.NoSuchProviderException">

</exception>

</method>

<method name="getInstance"

 return="java.security.Policy"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="params" type="java.security.Policy.Parameters">

</parameter>

<parameter name="provider" type="java.security.Provider">

</parameter>

<exception name="NoSuchAlgorithmException" type="java.security.NoSuchAlgorithmException">

</exception>

</method>

<method name="getParameters"

 return="java.security.Policy.Parameters"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getPermissions"

 return="java.security.PermissionCollection"

 abstract="true"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"
@@ -279520,6 +279511,28 @@ 
 visibility="public"

>

</method>

<method name="getProvider"

 return="java.security.Provider"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getType"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="implies"

 return="boolean"

 abstract="false"
@@ -279537,7 +279550,7 @@ 
</method>

<method name="refresh"

 return="void"

 abstract="true"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"
@@ -279559,6 +279572,93 @@ 
<parameter name="policy" type="java.security.Policy">

</parameter>

</method>

<field name="UNSUPPORTED_EMPTY_COLLECTION"

 type="java.security.PermissionCollection"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<interface name="Policy.Parameters"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</interface>

<class name="PolicySpi"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="PolicySpi"

 type="java.security.PolicySpi"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="engineGetPermissions"

 return="java.security.PermissionCollection"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="codesource" type="java.security.CodeSource">

</parameter>

</method>

<method name="engineGetPermissions"

 return="java.security.PermissionCollection"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="domain" type="java.security.ProtectionDomain">

</parameter>

</method>

<method name="engineImplies"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="domain" type="java.security.ProtectionDomain">

</parameter>

<parameter name="permission" type="java.security.Permission">

</parameter>

</method>

<method name="engineRefresh"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</method>

</class>

<interface name="Principal"

 abstract="true"

core/java/android/app/ActivityManager.java

+7 −4
Original line number Diff line number Diff line
@@ -755,14 +755,17 @@ public class ActivityManager { 
        public String pkgList[];

        

        /**

         * Constant for {@link #flags}: this is a heavy-weight process,

         * meaning it will not be killed while in the background.

         * Constant for {@link #flags}: this is an app that is unable to

         * correctly save its state when going to the background,

         * so it can not be killed while in the background.

         * @hide

         */

        public static final int FLAG_HEAVY_WEIGHT = 1<<0;

        public static final int FLAG_CANT_SAVE_STATE = 1<<0;

        

        /**

         * Flags of information.  May be any of

         * {@link #FLAG_HEAVY_WEIGHT}.

         * {@link #FLAG_CANT_SAVE_STATE}.

         * @hide

         */

        public int flags;

core/java/android/app/Notification.java

+7 −2
Original line number Diff line number Diff line
@@ -109,9 +109,14 @@ public class Notification implements Parcelable 
    public PendingIntent deleteIntent;



    /**

     * An intent to launch instead of posting the notification to the status bar. Only for use with

     * extremely high-priority notifications demanding the user's attention, such as an incoming

     * An intent to launch instead of posting the notification to the status bar.

     * Only for use with extremely high-priority notifications demanding the user's

     * <strong>immediate</strong>attention, such as an incoming phone call or

     * alarm clock that the user has explicitly set to a particular time.

     * call (handled in the core Android Phone app with a full-screen Activity).

     * If this facility is used for something else, please give the user an option

     * to turn it off and use a normal notification, as this can be extremely

     * disruptive.

     */

    public PendingIntent fullScreenIntent;

core/java/android/content/pm/ApplicationInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * increased in size for extra large screens.  Corresponds to

     * {@link android.R.styleable#AndroidManifestSupportsScreens_xlargeScreens

     * android:xlargeScreens}.

     * @hide

     */

    public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19;
@@ -311,7 +312,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * {@link #FLAG_ALLOW_CLEAR_USER_DATA}, {@link #FLAG_UPDATED_SYSTEM_APP},

     * {@link #FLAG_TEST_ONLY}, {@link #FLAG_SUPPORTS_SMALL_SCREENS},

     * {@link #FLAG_SUPPORTS_NORMAL_SCREENS},

     * {@link #FLAG_SUPPORTS_LARGE_SCREENS}, {@link #FLAG_SUPPORTS_XLARGE_SCREENS},

     * {@link #FLAG_SUPPORTS_LARGE_SCREENS},

     * {@link #FLAG_RESIZEABLE_FOR_SCREENS},

     * {@link #FLAG_SUPPORTS_SCREEN_DENSITIES}, {@link #FLAG_VM_SAFE_MODE}

     */

core/java/android/content/pm/PackageManager.java

+9 −0
Original line number Diff line number Diff line
@@ -799,6 +799,15 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device's touch screen is capable of

     * tracking a full hand of fingers fully independently -- that is, 5 or

     * more simultaneous independent pointers.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports live wallpapers.