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

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

Merge branch 'gingerbread' into gingerbread-release

parents 17535bdd d1f7f4a6

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -31092,6 +31092,17 @@ 
 visibility="public"

>

</field>

<field name="WIPE_EXTERNAL_STORAGE"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.app.backup"

cmds/servicemanager/service_manager.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static struct { 
    { AID_MEDIA, "media.player" },

    { AID_MEDIA, "media.camera" },

    { AID_MEDIA, "media.audio_policy" },

    { AID_NFC,   "nfc" },

    { AID_RADIO, "radio.phone" },

    { AID_RADIO, "radio.sms" },

    { AID_RADIO, "radio.phonesubinfo" },

cmds/stagefright/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ LOCAL_C_INCLUDES:= \ 
	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright/include \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include

	$(TOP)/frameworks/base/include/media/stagefright/openmax



LOCAL_CFLAGS += -Wno-multichar
@@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include

	$(TOP)/frameworks/base/include/media/stagefright/openmax



LOCAL_CFLAGS += -Wno-multichar
@@ -61,7 +61,7 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include

	$(TOP)/frameworks/base/include/media/stagefright/openmax



LOCAL_CFLAGS += -Wno-multichar

core/java/android/app/ActivityManager.java

+7 −0
Original line number Diff line number Diff line
@@ -762,6 +762,13 @@ public class ActivityManager { 
         */

        public static final int FLAG_CANT_SAVE_STATE = 1<<0;

        

        /**

         * Constant for {@link #flags}: this process is associated with a

         * persistent system app.

         * @hide

         */

        public static final int FLAG_PERSISTENT = 1<<1;



        /**

         * Flags of information.  May be any of

         * {@link #FLAG_CANT_SAVE_STATE}.

core/java/android/app/ContextImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -3140,6 +3140,7 @@ class ContextImpl extends Context { 
                    return;

                }

                XmlUtils.writeMapXml(mcr.mapToWriteToDisk, str);

                FileUtils.sync(str);

                str.close();

                setFilePermissionsFromMode(mFile.getPath(), mMode, 0);

                FileStatus stat = new FileStatus();