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

Commit 705a2df9 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread 

Merge commit 'c8525edc' into gingerbread-plus-aosp

* commit 'c8525edc':
  Remove memory monitoring from the system watchdog
parents 9b4b74be c8525edc

core/java/android/app/ActivityManagerNative.java

+0 −18
Original line number Original line Diff line number Diff line
@@ -1021,16 +1021,6 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

            return true;

        }

        }





        case REPORT_PSS_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            int pss = data.readInt();

            reportPss(app, pss);

            reply.writeNoException();

            return true;

        }



        case START_RUNNING_TRANSACTION: {

        case START_RUNNING_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            data.enforceInterface(IActivityManager.descriptor);

            String pkg = data.readString();

            String pkg = data.readString();
@@ -2529,14 +2519,6 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

        reply.recycle();

        return res;

        return res;

    }

    }

    public void reportPss(IApplicationThread caller, int pss) throws RemoteException {

        Parcel data = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller.asBinder());

        data.writeInt(pss);

        mRemote.transact(REPORT_PSS_TRANSACTION, data, null, 0);

        data.recycle();

    }

    public void startRunning(String pkg, String cls, String action,

    public void startRunning(String pkg, String cls, String action,

            String indata) throws RemoteException {

            String indata) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel data = Parcel.obtain();

core/java/android/app/ActivityThread.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -616,14 +616,6 @@ public final class ActivityThread { 
            queueOrSendMessage(H.ACTIVITY_CONFIGURATION_CHANGED, token);

            queueOrSendMessage(H.ACTIVITY_CONFIGURATION_CHANGED, token);

        }

        }





        public void requestPss() {

            try {

                ActivityManagerNative.getDefault().reportPss(this,

                        (int)Process.getPss(Process.myPid()));

            } catch (RemoteException e) {

            }

        }



        public void profilerControl(boolean start, String path, ParcelFileDescriptor fd) {

        public void profilerControl(boolean start, String path, ParcelFileDescriptor fd) {

            ProfilerControlData pcd = new ProfilerControlData();

            ProfilerControlData pcd = new ProfilerControlData();

            pcd.path = path;

            pcd.path = path;

core/java/android/app/ApplicationThreadNative.java

+0 −15
Original line number Original line Diff line number Diff line
@@ -341,13 +341,6 @@ public abstract class ApplicationThreadNative extends Binder 
            return true;

            return true;

        }

        }

        

        

        case REQUEST_PSS_TRANSACTION:

        {

            data.enforceInterface(IApplicationThread.descriptor);

            requestPss();

            return true;

        }

        

        case PROFILER_CONTROL_TRANSACTION:

        case PROFILER_CONTROL_TRANSACTION:

        {

        {

            data.enforceInterface(IApplicationThread.descriptor);

            data.enforceInterface(IApplicationThread.descriptor);
@@ -779,14 +772,6 @@ class ApplicationThreadProxy implements IApplicationThread { 
        data.recycle();

        data.recycle();

    }

    }

    

    

    public final void requestPss() throws RemoteException {

        Parcel data = Parcel.obtain();

        data.writeInterfaceToken(IApplicationThread.descriptor);

        mRemote.transact(REQUEST_PSS_TRANSACTION, data, null,

                IBinder.FLAG_ONEWAY);

        data.recycle();

    }

    

    public void profilerControl(boolean start, String path,

    public void profilerControl(boolean start, String path,

            ParcelFileDescriptor fd) throws RemoteException {

            ParcelFileDescriptor fd) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel data = Parcel.obtain();

core/java/android/app/IActivityManager.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -247,8 +247,6 @@ public interface IActivityManager extends IInterface { 
    

    

    public boolean killPids(int[] pids, String reason) throws RemoteException;

    public boolean killPids(int[] pids, String reason) throws RemoteException;

    

    

    public void reportPss(IApplicationThread caller, int pss) throws RemoteException;

    

    // Special low-level communication with activity manager.

    // Special low-level communication with activity manager.

    public void startRunning(String pkg, String cls, String action,

    public void startRunning(String pkg, String cls, String action,

            String data) throws RemoteException;

            String data) throws RemoteException;
@@ -502,7 +500,7 @@ public interface IActivityManager extends IInterface { 
    int FORCE_STOP_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+78;

    int FORCE_STOP_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+78;

    int KILL_PIDS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+79;

    int KILL_PIDS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+79;

    int GET_SERVICES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+80;

    int GET_SERVICES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+80;

    int REPORT_PSS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+81;



    int GET_RUNNING_APP_PROCESSES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+82;

    int GET_RUNNING_APP_PROCESSES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+82;

    int GET_DEVICE_CONFIGURATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+83;

    int GET_DEVICE_CONFIGURATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+83;

    int PEEK_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+84;

    int PEEK_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+84;

core/java/android/app/IApplicationThread.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ public interface IApplicationThread extends IInterface { 
            throws RemoteException;

            throws RemoteException;

    void scheduleLowMemory() throws RemoteException;

    void scheduleLowMemory() throws RemoteException;

    void scheduleActivityConfigurationChanged(IBinder token) throws RemoteException;

    void scheduleActivityConfigurationChanged(IBinder token) throws RemoteException;

    void requestPss() throws RemoteException;

    void profilerControl(boolean start, String path, ParcelFileDescriptor fd)

    void profilerControl(boolean start, String path, ParcelFileDescriptor fd)

            throws RemoteException;

            throws RemoteException;

    void setSchedulingGroup(int group) throws RemoteException;

    void setSchedulingGroup(int group) throws RemoteException;
@@ -132,7 +131,7 @@ public interface IApplicationThread extends IInterface { 
    int SCHEDULE_LOW_MEMORY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+23;

    int SCHEDULE_LOW_MEMORY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+23;

    int SCHEDULE_ACTIVITY_CONFIGURATION_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+24;

    int SCHEDULE_ACTIVITY_CONFIGURATION_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+24;

    int SCHEDULE_RELAUNCH_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+25;

    int SCHEDULE_RELAUNCH_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+25;

    int REQUEST_PSS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+26;



    int PROFILER_CONTROL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+27;

    int PROFILER_CONTROL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+27;

    int SET_SCHEDULING_GROUP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+28;

    int SET_SCHEDULING_GROUP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+28;

    int SCHEDULE_CREATE_BACKUP_AGENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+29;

    int SCHEDULE_CREATE_BACKUP_AGENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+29;