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

Commit 28432f03 authored by Todd Kennedy's avatar Todd Kennedy Committed by Android (Google) Code Review
Browse files

Merge "Rename the binder call createActivityContainer"

parents 3c8e3a96 ca4d8422

cmds/am/src/com/android/commands/am/Am.java

+2 −1
Original line number Diff line number Diff line
@@ -1695,7 +1695,8 @@ public class Am extends BaseCommand { 


        try {

            IBinder homeActivityToken = mAm.getHomeActivityToken();

            IActivityContainer container = mAm.createActivityContainer(homeActivityToken, null);

            IActivityContainer container =

                    mAm.createVirtualActivityContainer(homeActivityToken, null);

            container.attachToDisplay(displayId);

            container.startActivity(intent);

        } catch (RemoteException e) {

core/java/android/app/ActivityManagerNative.java

+4 −4
Original line number Diff line number Diff line
@@ -2184,13 +2184,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case CREATE_ACTIVITY_CONTAINER_TRANSACTION: {

        case CREATE_VIRTUAL_ACTIVITY_CONTAINER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder parentActivityToken = data.readStrongBinder();

            IActivityContainerCallback callback =

                    IActivityContainerCallback.Stub.asInterface(data.readStrongBinder());

            IActivityContainer activityContainer =

                    createActivityContainer(parentActivityToken, callback);

                    createVirtualActivityContainer(parentActivityToken, callback);

            reply.writeNoException();

            if (activityContainer != null) {

                reply.writeInt(1);
@@ -5208,14 +5208,14 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

    }



    public IActivityContainer createActivityContainer(IBinder parentActivityToken,

    public IActivityContainer createVirtualActivityContainer(IBinder parentActivityToken,

            IActivityContainerCallback callback) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(parentActivityToken);

        data.writeStrongBinder(callback == null ? null : callback.asBinder());

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

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

        reply.readException();

        final int result = reply.readInt();

        final IActivityContainer res;

core/java/android/app/ActivityView.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class ActivityView extends ViewGroup { 


        try {

            mActivityContainer = new ActivityContainerWrapper(

                    ActivityManagerNative.getDefault().createActivityContainer(

                    ActivityManagerNative.getDefault().createVirtualActivityContainer(

                            mActivity.getActivityToken(), new ActivityContainerCallback(this)));

        } catch (RemoteException e) {

            throw new RuntimeException("ActivityView: Unable to create ActivityContainer. "

core/java/android/app/IActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ public interface IActivityManager extends IInterface { 


    public void performIdleMaintenance() throws RemoteException;



    public IActivityContainer createActivityContainer(IBinder parentActivityToken,

    public IActivityContainer createVirtualActivityContainer(IBinder parentActivityToken,

            IActivityContainerCallback callback) throws RemoteException;



    public void deleteActivityContainer(IActivityContainer container) throws RemoteException;
@@ -738,7 +738,7 @@ public interface IActivityManager extends IInterface { 
    int KILL_UID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+164;

    int SET_USER_IS_MONKEY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+165;

    int HANG_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+166;

    int CREATE_ACTIVITY_CONTAINER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+167;

    int CREATE_VIRTUAL_ACTIVITY_CONTAINER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+167;

    int MOVE_TASK_TO_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+168;

    int RESIZE_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+169;

    int GET_ALL_STACK_INFOS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+170;

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -8097,7 +8097,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    }















    @Override













    public IActivityContainer createActivityContainer(IBinder parentActivityToken,













    public IActivityContainer createVirtualActivityContainer(IBinder parentActivityToken,















            IActivityContainerCallback callback) throws RemoteException {















        enforceCallingPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS,















                "createActivityContainer()");









@@ -8112,7 +8112,7 @@ public final class ActivityManagerService extends ActivityManagerNative













            if (callback == null) {















                throw new IllegalArgumentException("callback must not be null");















            }













            return mStackSupervisor.createActivityContainer(r, callback);













            return mStackSupervisor.createVirtualActivityContainer(r, callback);















        }















    }