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

Commit 2b3cc8f3 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents b3bc8292 07f3bee2

api/current.xml

+109 −33
Original line number Diff line number Diff line
@@ -18536,17 +18536,6 @@ 
 visibility="public"

>

</field>

<field name="IMPORTANCE_HEAVY_WEIGHT"

 type="int"

 transient="false"

 volatile="false"

 value="170"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IMPORTANCE_PERCEPTIBLE"

 type="int"

 transient="false"
@@ -49296,6 +49285,17 @@ 
 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"
@@ -99804,6 +99804,18 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="data" type="byte[]">

</parameter>

<exception name="FormatException" type="android.nfc.FormatException">

</exception>

</constructor>

<constructor name="NdefMessage"

 type="android.nfc.NdefMessage"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="records" type="android.nfc.NdefRecord[]">

</parameter>

</constructor>
@@ -99829,6 +99841,17 @@ 
 visibility="public"

>

</method>

<method name="toByteArray"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"
@@ -99948,6 +99971,17 @@ 
 visibility="public"

>

</method>

<method name="toByteArray"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"
@@ -100138,6 +100172,29 @@ 
>

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

</implements>

<method name="createMockNdefTag"

 return="android.nfc.NdefTag"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="id" type="byte[]">

</parameter>

<parameter name="rawTargets" type="java.lang.String[]">

</parameter>

<parameter name="pollBytes" type="byte[]">

</parameter>

<parameter name="activationBytes" type="byte[]">

</parameter>

<parameter name="ndefTargets" type="java.lang.String[]">

</parameter>

<parameter name="messages" type="android.nfc.NdefMessage[][]">

</parameter>

</method>

<method name="getNdefMessages"

 return="android.nfc.NdefMessage[]"

 abstract="false"
@@ -100607,6 +100664,25 @@ 
>

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

</implements>

<method name="createMockTag"

 return="android.nfc.Tag"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="id" type="byte[]">

</parameter>

<parameter name="rawTargets" type="java.lang.String[]">

</parameter>

<parameter name="pollBytes" type="byte[]">

</parameter>

<parameter name="activationBytes" type="byte[]">

</parameter>

</method>

<method name="describeContents"

 return="int"

 abstract="false"
@@ -100618,6 +100694,17 @@ 
 visibility="public"

>

</method>

<method name="getActivationBytes"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getId"

 return="byte[]"

 abstract="false"
@@ -100629,6 +100716,17 @@ 
 visibility="public"

>

</method>

<method name="getPollBytes"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getRawTargets"

 return="java.lang.String[]"

 abstract="false"
@@ -100687,17 +100785,6 @@ 
 visibility="public"

>

</field>

<field name="TARGET_ISO_14443_3B_PRIME"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;iso14443_3b&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TARGET_ISO_14443_4"

 type="java.lang.String"

 transient="false"
@@ -100742,17 +100829,6 @@ 
 visibility="public"

>

</field>

<field name="TARGET_TOPAZ"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;topaz&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.opengl"

cmds/installd/commands.c

+2 −4
Original line number Diff line number Diff line
@@ -946,14 +946,12 @@ int linklib(const char* dataDir, const char* asecLibDir) 
    const size_t libdirLen = strlen(dataDir) + strlen(PKG_LIB_POSTFIX);

    if (libdirLen >= PKG_PATH_MAX) {

        LOGE("library dir len too large");

        rc = -1;

        goto out;

        return -1;

    }



    if (snprintf(libdir, sizeof(libdir), "%s%s", dataDir, PKG_LIB_POSTFIX) != (ssize_t)libdirLen) {

        LOGE("library dir not written successfully: %s\n", strerror(errno));

        rc = -1;

        goto out;

        return -1;

    }



    if (stat(dataDir, &s) < 0) return -1;

core/java/android/app/ActivityManager.java

+5 −3
Original line number Diff line number Diff line
@@ -797,10 +797,12 @@ public class ActivityManager { 
        public static final int IMPORTANCE_PERCEPTIBLE = 130;

        

        /**

         * Constant for {@link #importance}: this process is running a

         * heavy-weight application and thus should not be killed.

         * Constant for {@link #importance}: this process is running an

         * application that can not save its state, and thus can't be killed

         * while in the background.

         * @hide

         */

        public static final int IMPORTANCE_HEAVY_WEIGHT = 170;

        public static final int IMPORTANCE_CANT_SAVE_STATE = 170;

        

        /**

         * Constant for {@link #importance}: this process is contains services

core/java/android/content/res/Configuration.java

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
    public static final int SCREENLAYOUT_SIZE_SMALL = 0x01;

    public static final int SCREENLAYOUT_SIZE_NORMAL = 0x02;

    public static final int SCREENLAYOUT_SIZE_LARGE = 0x03;

    /** @hide */

    public static final int SCREENLAYOUT_SIZE_XLARGE = 0x04;

    

    public static final int SCREENLAYOUT_LONG_MASK = 0x30;

core/java/android/nfc/NdefMessage.java

+1 −7
Original line number Diff line number Diff line
@@ -34,15 +34,12 @@ public class NdefMessage implements Parcelable { 


    private final NdefRecord[] mRecords;



    //TODO(npelly) FormatException

    /**

     * Create an NDEF message from raw bytes.

     * <p>

     * Validation is performed to make sure the Record format headers are valid,

     * and the ID + TYPE + PAYLOAD fields are of the correct size.

     * @throws FormatException

     *

     * @hide

     */

    public NdefMessage(byte[] data) throws FormatException {

        mRecords = null;  // stop compiler complaints about final field
@@ -69,10 +66,7 @@ public class NdefMessage implements Parcelable { 
    }



    /**

     * Get a byte array representation of this NDEF message.

     *

     * @return byte array

     * @hide

     * Returns a byte array representation of this entire NDEF message.

     */

    public byte[] toByteArray() {

        //TODO(nxp): do not return null