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

Commit af4df827 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into froyo-release

parents d083febb 9818d750

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -88413,7 +88413,7 @@ 
 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="private"

 visibility="public"

>

<method name="startDownloadByUri"

 return="long"

core/java/android/app/ActivityManagerNative.java

+49 −0
Original line number Diff line number Diff line
@@ -168,6 +168,29 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case START_ACTIVITY_WITH_CONFIG_TRANSACTION:

        {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            Intent intent = Intent.CREATOR.createFromParcel(data);

            String resolvedType = data.readString();

            Uri[] grantedUriPermissions = data.createTypedArray(Uri.CREATOR);

            int grantedMode = data.readInt();

            IBinder resultTo = data.readStrongBinder();

            String resultWho = data.readString();    

            int requestCode = data.readInt();

            boolean onlyIfNeeded = data.readInt() != 0;

            boolean debug = data.readInt() != 0;

            Configuration config = Configuration.CREATOR.createFromParcel(data);

            int result = startActivityWithConfig(app, intent, resolvedType,

                    grantedUriPermissions, grantedMode, resultTo, resultWho,

                    requestCode, onlyIfNeeded, debug, config);

            reply.writeNoException();

            reply.writeInt(result);

            return true;

        }



        case START_ACTIVITY_INTENT_SENDER_TRANSACTION:

        {

            data.enforceInterface(IActivityManager.descriptor);
@@ -1295,6 +1318,32 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        return result;

    }

    public int startActivityWithConfig(IApplicationThread caller, Intent intent,

            String resolvedType, Uri[] grantedUriPermissions, int grantedMode,

            IBinder resultTo, String resultWho,

            int requestCode, boolean onlyIfNeeded,

            boolean debug, Configuration config) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        intent.writeToParcel(data, 0);

        data.writeString(resolvedType);

        data.writeTypedArray(grantedUriPermissions, 0);

        data.writeInt(grantedMode);

        data.writeStrongBinder(resultTo);

        data.writeString(resultWho);

        data.writeInt(requestCode);

        data.writeInt(onlyIfNeeded ? 1 : 0);

        data.writeInt(debug ? 1 : 0);

        config.writeToParcel(data, 0);

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

        reply.readException();

        int result = reply.readInt();

        reply.recycle();

        data.recycle();

        return result;

    }

    public int startActivityIntentSender(IApplicationThread caller,

            IntentSender intent, Intent fillInIntent, String resolvedType,

            IBinder resultTo, String resultWho, int requestCode,

core/java/android/app/IActivityManager.java

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ public interface IActivityManager extends IInterface { 
            Intent intent, String resolvedType, Uri[] grantedUriPermissions,

            int grantedMode, IBinder resultTo, String resultWho, int requestCode,

            boolean onlyIfNeeded, boolean debug) throws RemoteException;

    public int startActivityWithConfig(IApplicationThread caller,

            Intent intent, String resolvedType, Uri[] grantedUriPermissions,

            int grantedMode, IBinder resultTo, String resultWho, int requestCode,

            boolean onlyIfNeeded, boolean debug, Configuration newConfig) throws RemoteException;

    public int startActivityIntentSender(IApplicationThread caller,

            IntentSender intent, Intent fillInIntent, String resolvedType,

            IBinder resultTo, String resultWho, int requestCode,
@@ -503,4 +507,5 @@ public interface IActivityManager extends IInterface { 
    int IS_USER_A_MONKEY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+103;

    int START_ACTIVITY_AND_WAIT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+104;

    int WILL_ACTIVITY_BE_VISIBLE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+105;

    int START_ACTIVITY_WITH_CONFIG_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+106;

}

core/java/android/content/ContentValues.java

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public final class ContentValues implements Parcelable { 
     * Creates a set of values copied from the given HashMap. This is used

     * by the Parcel unmarshalling code.

     *

     * @param from the values to start with

     * @param values the values to start with

     * {@hide}

     */

    private ContentValues(HashMap<String, Object> values) {
@@ -248,7 +248,7 @@ public final class ContentValues implements Parcelable { 
     */

    public String getAsString(String key) {

        Object value = mValues.get(key);

        return value != null ? mValues.get(key).toString() : null;

        return value != null ? value.toString() : null;

    }



    /**

core/java/android/net/Downloads.java

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ public final class Downloads { 
    /**

     * Base class with common functionality for the various download classes

     */

    private static class DownloadBase {

    public static class DownloadBase {

        /** @hide */

        DownloadBase() {}