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

Commit 1555eceb authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 878d6893 27cf4ad8

api/current.xml

+204 −72
Original line number Diff line number Diff line
@@ -4508,17 +4508,6 @@ 
 visibility="public"

>

</field>

<field name="heavyWeight"

 type="int"

 transient="false"

 volatile="false"

 value="16843456"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="height"

 type="int"

 transient="false"
@@ -4721,7 +4710,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 value="16843456"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -5927,6 +5916,17 @@ 
 visibility="public"

>

</field>

<field name="kraken_resource_pad64"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad7"

 type="int"

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

>

</method>

<method name="isImmersive"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isTaskRoot"

 return="boolean"

 abstract="false"
@@ -20507,19 +20496,6 @@ 
<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="setImmersive"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setIntent"

 return="void"

 abstract="false"
@@ -26657,17 +26633,6 @@ 
 visibility="public"

>

</field>

<field name="FLAG_HIGH_PRIORITY"

 type="int"

 transient="false"

 volatile="false"

 value="128"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_INSISTENT"

 type="int"

 transient="false"
@@ -46095,17 +46060,6 @@ 
 visibility="public"

>

</field>

<field name="FLAG_IMMERSIVE"

 type="int"

 transient="false"

 volatile="false"

 value="512"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_MULTIPROCESS"

 type="int"

 transient="false"
@@ -46505,17 +46459,6 @@ 
 visibility="public"

>

</field>

<field name="FLAG_HEAVY_WEIGHT"

 type="int"

 transient="false"

 volatile="false"

 value="1048576"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_KILL_AFTER_RESTORE"

 type="int"

 transient="false"
@@ -76135,6 +76078,19 @@ 
 visibility="public"

>

</method>

<method name="getPreviewFpsRange"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="range" type="int[]">

</parameter>

</method>

<method name="getPreviewFrameRate"

 return="int"

 abstract="false"
@@ -76142,7 +76098,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -76267,6 +76223,17 @@ 
 visibility="public"

>

</method>

<method name="getSupportedPreviewFpsRange"

 return="java.util.List&lt;int[]&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSupportedPreviewFrameRates"

 return="java.util.List&lt;java.lang.Integer&gt;"

 abstract="false"
@@ -76274,7 +76241,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -76656,7 +76623,7 @@ 
<parameter name="pixel_format" type="int">

</parameter>

</method>

<method name="setPreviewFrameRate"

<method name="setPreviewFpsRange"

 return="void"

 abstract="false"

 native="false"
@@ -76666,6 +76633,21 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="setPreviewFrameRate"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

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

</parameter>

</method>
@@ -77079,6 +77061,28 @@ 
 visibility="public"

>

</field>

<field name="PREVIEW_FPS_MAX_INDEX"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PREVIEW_FPS_MIN_INDEX"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SCENE_MODE_ACTION"

 type="java.lang.String"

 transient="false"
@@ -84089,6 +84093,17 @@ 
 visibility="public"

>

</field>

<field name="PROVIDERS_CHANGED_ACTION"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.location.PROVIDERS_CHANGED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="LocationProvider"

 extends="java.lang.Object"
@@ -137551,6 +137566,39 @@ 
>

</field>

</class>

<class name="ContactsContract.CommonDataKinds.SipAddress"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.provider.ContactsContract.DataColumnsWithJoins">

</implements>

<field name="CONTENT_ITEM_TYPE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;vnd.android.cursor.item/sip_address&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SIP_ADDRESS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;data1&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ContactsContract.CommonDataKinds.StructuredName"

 extends="java.lang.Object"

 abstract="false"
@@ -198047,6 +198095,19 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getSelectedText"

 return="java.lang.CharSequence"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="getTextAfterCursor"

 return="java.lang.CharSequence"

 abstract="false"
@@ -198157,6 +198218,21 @@ 
<parameter name="event" type="android.view.KeyEvent">

</parameter>

</method>

<method name="setComposingRegion"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="setComposingSpans"

 return="void"

 abstract="false"
@@ -199151,6 +199227,19 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getSelectedText"

 return="java.lang.CharSequence"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="getTextAfterCursor"

 return="java.lang.CharSequence"

 abstract="true"
@@ -199248,6 +199337,21 @@ 
<parameter name="event" type="android.view.KeyEvent">

</parameter>

</method>

<method name="setComposingRegion"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="setComposingText"

 return="boolean"

 abstract="true"
@@ -199440,6 +199544,19 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getSelectedText"

 return="java.lang.CharSequence"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="getTextAfterCursor"

 return="java.lang.CharSequence"

 abstract="false"
@@ -199537,6 +199654,21 @@ 
<parameter name="event" type="android.view.KeyEvent">

</parameter>

</method>

<method name="setComposingRegion"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="setComposingText"

 return="boolean"

 abstract="false"

core/java/android/app/Activity.java

+1 −40
Original line number Diff line number Diff line
@@ -1162,6 +1162,7 @@ public class Activity extends ContextThemeWrapper 
     */

    protected void onPause() {

        mCalled = true;

        QueuedWork.waitToFinish();

    }



    /**
@@ -3739,46 +3740,6 @@ public class Activity extends ContextThemeWrapper 
        return null;

    }



    /**

     * Bit indicating that this activity is "immersive" and should not be

     * interrupted by notifications if possible.

     *

     * This value is initially set by the manifest property

     * <code>android:immersive</code> but may be changed at runtime by

     * {@link #setImmersive}.

     *

     * @see android.content.pm.ActivityInfo#FLAG_IMMERSIVE

     */

    public boolean isImmersive() {

        try {

            return ActivityManagerNative.getDefault().isImmersive(mToken);

        } catch (RemoteException e) {

            return false;

        }

    }



    /**

     * Adjust the current immersive mode setting.

     * 

     * Note that changing this value will have no effect on the activity's

     * {@link android.content.pm.ActivityInfo} structure; that is, if

     * <code>android:immersive</code> is set to <code>true</code>

     * in the application's manifest entry for this activity, the {@link

     * android.content.pm.ActivityInfo#flags ActivityInfo.flags} member will

     * always have its {@link android.content.pm.ActivityInfo#FLAG_IMMERSIVE

     * FLAG_IMMERSIVE} bit set.

     *

     * @see #isImmersive

     * @see android.content.pm.ActivityInfo#FLAG_IMMERSIVE

     */

    public void setImmersive(boolean i) {

        try {

            ActivityManagerNative.getDefault().setImmersive(mToken, i);

        } catch (RemoteException e) {

            // pass

        }

    }



    // ------------------ Internal API ------------------

    

    final void setParent(Activity parent) {

core/java/android/app/ActivityManagerNative.java

+0 −66
Original line number Diff line number Diff line
@@ -1261,32 +1261,6 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case IS_IMMERSIVE_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            boolean isit = isImmersive(token);

            reply.writeNoException();

            reply.writeInt(isit ? 1 : 0);

            return true;

        }



        case SET_IMMERSIVE_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            boolean imm = data.readInt() == 1;

            setImmersive(token, imm);

            reply.writeNoException();

            return true;

        }

        

        case IS_TOP_ACTIVITY_IMMERSIVE_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            boolean isit = isTopActivityImmersive();

            reply.writeNoException();

            reply.writeInt(isit ? 1 : 0);

            return true;

        }



        case CRASH_APPLICATION_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            int uid = data.readInt();
@@ -2858,46 +2832,6 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

    }

    

    public void setImmersive(IBinder token, boolean immersive)

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        data.writeInt(immersive ? 1 : 0);

        mRemote.transact(SET_IMMERSIVE_TRANSACTION, data, reply, 0);

        reply.readException();

        data.recycle();

        reply.recycle();

    }



    public boolean isImmersive(IBinder token)

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        mRemote.transact(IS_IMMERSIVE_TRANSACTION, data, reply, 0);

        reply.readException();

        boolean res = reply.readInt() == 1;

        data.recycle();

        reply.recycle();

        return res;

    }



    public boolean isTopActivityImmersive()

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        mRemote.transact(IS_TOP_ACTIVITY_IMMERSIVE_TRANSACTION, data, reply, 0);

        reply.readException();

        boolean res = reply.readInt() == 1;

        data.recycle();

        reply.recycle();

        return res;

    }



    public void crashApplication(int uid, int initialPid, String packageName,

            String message) throws RemoteException {

        Parcel data = Parcel.obtain();

core/java/android/app/ActivityThread.java

+16 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public final class ActivityThread { 
            = new ArrayList<Application>();

    // set of instantiated backup agents, keyed by package name

    final HashMap<String, BackupAgent> mBackupAgents = new HashMap<String, BackupAgent>();

    static final ThreadLocal sThreadLocal = new ThreadLocal();

    static final ThreadLocal<ActivityThread> sThreadLocal = new ThreadLocal();

    Instrumentation mInstrumentation;

    String mInstrumentationAppDir = null;

    String mInstrumentationAppPackage = null;
@@ -186,6 +186,8 @@ public final class ActivityThread { 
    final GcIdler mGcIdler = new GcIdler();

    boolean mGcIdlerScheduled = false;



    static Handler sMainThreadHandler;  // set once in main()



    private static final class ActivityClientRecord {

        IBinder token;

        int ident;
@@ -1111,7 +1113,7 @@ public final class ActivityThread { 
    }



    public static final ActivityThread currentActivityThread() {

        return (ActivityThread)sThreadLocal.get();

        return sThreadLocal.get();

    }



    public static final String currentPackageName() {
@@ -1780,6 +1782,8 @@ public final class ActivityThread { 
            }

        }



        QueuedWork.waitToFinish();



        try {

            if (data.sync) {

                if (DEBUG_BROADCAST) Slog.i(TAG,
@@ -2007,6 +2011,9 @@ public final class ActivityThread { 
                    data.args.setExtrasClassLoader(s.getClassLoader());

                }

                int res = s.onStartCommand(data.args, data.flags, data.startId);



                QueuedWork.waitToFinish();



                try {

                    ActivityManagerNative.getDefault().serviceDoneExecuting(

                            data.token, 1, data.startId, res);
@@ -2035,6 +2042,9 @@ public final class ActivityThread { 
                    final String who = s.getClassName();

                    ((ContextImpl) context).scheduleFinalCleanup(who, "Service");

                }



                QueuedWork.waitToFinish();



                try {

                    ActivityManagerNative.getDefault().serviceDoneExecuting(

                            token, 0, 0, 0);
@@ -3171,6 +3181,7 @@ public final class ActivityThread { 
            instrApp.sourceDir = ii.sourceDir;

            instrApp.publicSourceDir = ii.publicSourceDir;

            instrApp.dataDir = ii.dataDir;

            instrApp.nativeLibraryDir = ii.nativeLibraryDir;

            LoadedApk pi = getPackageInfo(instrApp,

                    appContext.getClassLoader(), false, true);

            ContextImpl instrContext = new ContextImpl();
@@ -3598,6 +3609,9 @@ public final class ActivityThread { 
        Process.setArgV0("<pre-initialized>");



        Looper.prepareMainLooper();

        if (sMainThreadHandler == null) {

            sMainThreadHandler = new Handler();

        }



        ActivityThread thread = new ActivityThread();

        thread.attach(false);

core/java/android/app/ApplicationLoaders.java

+5 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app; 
import dalvik.system.PathClassLoader;



import java.util.HashMap;

import java.util.Map;



class ApplicationLoaders

{
@@ -27,8 +28,7 @@ class ApplicationLoaders 
        return gApplicationLoaders;

    }



    public ClassLoader getClassLoader(String zip, String appDataDir,

            ClassLoader parent)

    public ClassLoader getClassLoader(String zip, String libPath, ClassLoader parent)

    {

        /*

         * This is the parent we use if they pass "null" in.  In theory
@@ -49,13 +49,13 @@ class ApplicationLoaders 
             * new ClassLoader for the zip archive.

             */

            if (parent == baseParent) {

                ClassLoader loader = (ClassLoader)mLoaders.get(zip);

                ClassLoader loader = mLoaders.get(zip);

                if (loader != null) {

                    return loader;

                }

    

                PathClassLoader pathClassloader =

                    new PathClassLoader(zip, appDataDir + "/lib", parent);

                    new PathClassLoader(zip, libPath, parent);

                

                mLoaders.put(zip, pathClassloader);

                return pathClassloader;
@@ -65,7 +65,7 @@ class ApplicationLoaders 
        }

    }



    private final HashMap mLoaders = new HashMap();

    private final Map<String, ClassLoader> mLoaders = new HashMap<String, ClassLoader>();



    private static final ApplicationLoaders gApplicationLoaders

        = new ApplicationLoaders();