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

Commit e635f668 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Don't read float from parcel 

We were reading a float from a parcel, but, never writing the float. Also
opportunistically fix a couple warnings where we were using raw classes
instead of their templatized version.

Bug: 19001243
Change-Id: I6e2a72795cf12bfaf880f2f46c1d91b207aa327c
parent 61369de0

core/java/android/app/ActivityManagerNative.java

+9 −8
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
        case RESIZE_STACK_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            int stackId = data.readInt();

            float weight = data.readFloat();

            Rect r = Rect.CREATOR.createFromParcel(data);

            resizeStack(stackId, r);

            reply.writeNoException();
@@ -2991,7 +2990,7 @@ class ActivityManagerProxy implements IActivityManager 
        ArrayList<IAppTask> list = null;

        int N = reply.readInt();

        if (N >= 0) {

            list = new ArrayList<IAppTask>();

            list = new ArrayList<>();

            while (N > 0) {

                IAppTask task = IAppTask.Stub.asInterface(reply.readStrongBinder());

                list.add(task);
@@ -3029,7 +3028,8 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

        return size;

    }

    public List getTasks(int maxNum, int flags) throws RemoteException {

    public List<ActivityManager.RunningTaskInfo> getTasks(int maxNum, int flags)

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);
@@ -3037,10 +3037,10 @@ class ActivityManagerProxy implements IActivityManager 
        data.writeInt(flags);

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

        reply.readException();

        ArrayList list = null;

        ArrayList<ActivityManager.RunningTaskInfo> list = null;

        int N = reply.readInt();

        if (N >= 0) {

            list = new ArrayList();

            list = new ArrayList<>();

            while (N > 0) {

                ActivityManager.RunningTaskInfo info =

                        ActivityManager.RunningTaskInfo.CREATOR
@@ -3084,7 +3084,8 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

        return taskThumbnail;

    }

    public List getServices(int maxNum, int flags) throws RemoteException {

    public List<ActivityManager.RunningServiceInfo> getServices(int maxNum, int flags)

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);
@@ -3092,10 +3093,10 @@ class ActivityManagerProxy implements IActivityManager 
        data.writeInt(flags);

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

        reply.readException();

        ArrayList list = null;

        ArrayList<ActivityManager.RunningServiceInfo> list = null;

        int N = reply.readInt();

        if (N >= 0) {

            list = new ArrayList();

            list = new ArrayList<>();

            while (N > 0) {

                ActivityManager.RunningServiceInfo info =

                        ActivityManager.RunningServiceInfo.CREATOR