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

Commit 04f2c485 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents da686f7e b4116c09

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/6.xml 6 \

    -since ./frameworks/base/api/7.xml 7 \

    -since ./frameworks/base/api/8.xml 8 \

    -since ./frameworks/base/api/9.xml 9 \

    -werror -hide 13 \

    -overview $(LOCAL_PATH)/core/java/overview.html

api/current.xml

+14 −3235

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/nfc/NdefRecord.java

+12 −2
Original line number Diff line number Diff line
@@ -200,8 +200,17 @@ public class NdefRecord implements Parcelable { 
     *

     * @throws FormatException if the data is not a valid NDEF record

     */

    public NdefRecord(byte[] data) {

        throw new UnsupportedOperationException();

    public NdefRecord(byte[] data) throws FormatException {

        /* Prevent compiler to complain about unassigned final fields */

        mFlags = 0;

        mTnf = 0;

        mType = null;

        mId = null;

        mPayload = null;

        /* Perform actual parsing */

        if (parseNdefRecord(data) == -1) {

            throw new FormatException("Error while parsing NDEF record");

        }

    }



    /**
@@ -280,5 +289,6 @@ public class NdefRecord implements Parcelable { 
        }

    };



    private native int parseNdefRecord(byte[] data);

    private native byte[] generate(short flags, short tnf, byte[] type, byte[] id, byte[] data);

}
 
 No newline at end of file

core/java/android/os/Build.java

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public class Build { 
         * graphics to ensure they look okay on a dark background.

         * </ul>

         */

        public static final int GINGERBREAD = CUR_DEVELOPMENT;

        public static final int GINGERBREAD = 9;

    }

    

    /** The type of build, like "user" or "eng". */

core/java/android/os/StrictMode.java

+19 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import java.util.HashMap; 
 *                 .penaltyLog()

 *                 .build());

 *         StrictMode.setVmPolicy(new {@link VmPolicy.Builder StrictMode.VmPolicy.Builder}()

 *                 .detectLeakedSqlLiteCursors()

 *                 .detectLeakedSqlLiteObjects()

 *                 .penaltyLog()

 *                 .penaltyDeath()

 *                 .build());
@@ -961,6 +961,24 @@ public final class StrictMode { 
        return new VmPolicy(sVmPolicyMask);

    }



    /**

     * Enable the recommended StrictMode defaults, with violations just being logged.

     *

     * <p>This catches disk and network access on the main thread, as

     * well as leaked SQLite cursors.  This is simply a wrapper around

     * {@link #setVmPolicy} and {@link #setThreadPolicy}.

     */

    public static void enableDefaults() {

        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()

                                   .detectAll()

                                   .penaltyLog()

                                   .build());

        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()

                               .detectLeakedSqlLiteObjects()

                               .penaltyLog()

                               .build());

    }



    /**

     * @hide

     */