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

Commit d262744b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Some cruft removal."

parents f59f92f1 21fbd1f7

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/accounts/IAccountAuthenticatorResponse.aidl \

	core/java/android/app/IActivityController.aidl \

	core/java/android/app/IActivityPendingResult.aidl \

	core/java/android/app/IActivityWatcher.aidl \

	core/java/android/app/IAlarmManager.aidl \

	core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

api/16.txt

+1 −1
Original line number Diff line number Diff line
@@ -15052,7 +15052,7 @@ package android.os { 
    method public static final deprecated boolean supportsProcesses();

    field public static final int BLUETOOTH_GID = 2000; // 0x7d0

    field public static final int FIRST_APPLICATION_UID = 10000; // 0x2710

    field public static final int LAST_APPLICATION_UID = 89999; // 0x1869f

    field public static final int LAST_APPLICATION_UID = 19999; // 0x1869f

    field public static final int PHONE_UID = 1001; // 0x3e9

    field public static final int SIGNAL_KILL = 9; // 0x9

    field public static final int SIGNAL_QUIT = 3; // 0x3

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15180,7 +15180,7 @@ package android.os { 
    method public static final deprecated boolean supportsProcesses();

    field public static final int BLUETOOTH_GID = 2000; // 0x7d0

    field public static final int FIRST_APPLICATION_UID = 10000; // 0x2710

    field public static final int LAST_APPLICATION_UID = 89999; // 0x15f8f

    field public static final int LAST_APPLICATION_UID = 19999; // 0x4e1f

    field public static final int PHONE_UID = 1001; // 0x3e9

    field public static final int SIGNAL_KILL = 9; // 0x9

    field public static final int SIGNAL_QUIT = 3; // 0x3

core/java/android/app/ActivityManagerNative.java

+0 −61
Original line number Diff line number Diff line
@@ -554,15 +554,6 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case FINISH_OTHER_INSTANCES_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            ComponentName className = ComponentName.readFromParcel(data);

            finishOtherInstances(token, className);

            reply.writeNoException();

            return true;

        }



        case REPORT_THUMBNAIL_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();
@@ -1192,22 +1183,6 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }

        

        case REGISTER_ACTIVITY_WATCHER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IActivityWatcher watcher = IActivityWatcher.Stub.asInterface(

                    data.readStrongBinder());

            registerActivityWatcher(watcher);

            return true;

        }

        

        case UNREGISTER_ACTIVITY_WATCHER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IActivityWatcher watcher = IActivityWatcher.Stub.asInterface(

                    data.readStrongBinder());

            unregisterActivityWatcher(watcher);

            return true;

        }

        

        case START_ACTIVITY_IN_PACKAGE_TRANSACTION:

        {

            data.enforceInterface(IActivityManager.descriptor);
@@ -2164,18 +2139,6 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

        return res;

    }

    public void finishOtherInstances(IBinder token, ComponentName className) throws RemoteException

    {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        ComponentName.writeToParcel(className, data);

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

        reply.readException();

        data.recycle();

        reply.recycle();

    }

    public void reportThumbnail(IBinder token,

                                Bitmap thumbnail, CharSequence description) throws RemoteException

    {
@@ -3024,30 +2987,6 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

    }

    

    public void registerActivityWatcher(IActivityWatcher watcher)

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

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

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

        reply.readException();

        data.recycle();

        reply.recycle();

    }

    

    public void unregisterActivityWatcher(IActivityWatcher watcher)

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

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

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

        reply.readException();

        data.recycle();

        reply.recycle();

    }

    

    public int startActivityInPackage(int uid,

            Intent intent, String resolvedType, IBinder resultTo,

            String resultWho, int requestCode, boolean onlyIfNeeded)

core/java/android/app/IActivityManager.java

+3 −9
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ public interface IActivityManager extends IInterface { 
    public boolean moveActivityTaskToBack(IBinder token, boolean nonRoot) throws RemoteException;

    public void moveTaskBackwards(int task) throws RemoteException;

    public int getTaskForActivity(IBinder token, boolean onlyRoot) throws RemoteException;

    public void finishOtherInstances(IBinder token, ComponentName className) throws RemoteException;

    /* oneway */

    public void reportThumbnail(IBinder token,

            Bitmap thumbnail, CharSequence description) throws RemoteException;
@@ -295,11 +294,6 @@ public interface IActivityManager extends IInterface { 
    public void stopAppSwitches() throws RemoteException;

    public void resumeAppSwitches() throws RemoteException;

    

    public void registerActivityWatcher(IActivityWatcher watcher)

            throws RemoteException;

    public void unregisterActivityWatcher(IActivityWatcher watcher)

            throws RemoteException;



    public int startActivityInPackage(int uid,

            Intent intent, String resolvedType, IBinder resultTo,

            String resultWho, int requestCode, boolean onlyIfNeeded)
@@ -505,7 +499,7 @@ public interface IActivityManager extends IInterface { 
    int BIND_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+35;

    int UNBIND_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+36;

    int PUBLISH_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+37;

    int FINISH_OTHER_INSTANCES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+38;



    int GOING_TO_SLEEP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+39;

    int WAKING_UP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+40;

    int SET_DEBUG_APP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+41;
@@ -559,8 +553,8 @@ public interface IActivityManager extends IInterface { 
    int START_BACKUP_AGENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+89;

    int BACKUP_AGENT_CREATED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+90;

    int UNBIND_BACKUP_AGENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+91;

    int REGISTER_ACTIVITY_WATCHER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+92;

    int UNREGISTER_ACTIVITY_WATCHER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+93;





    int START_ACTIVITY_IN_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+94;

    int KILL_APPLICATION_WITH_UID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+95;

    int CLOSE_SYSTEM_DIALOGS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+96;