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

Commit 2f076731 authored by Martin Brabham's avatar Martin Brabham Committed by Matt Garnes
Browse files

Rebase on CAF 

Change-Id: I4e357ddd6b8759c88450cd098b76b4c0247ec035
parent 2f694924

telecomm/java/android/telecom/ConnectionServiceAdapterServant.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -63,8 +63,7 @@ final class ConnectionServiceAdapterServant { 
    private static final int MSG_SET_CALL_SUBSTATE = 23;

    private static final int MSG_SET_CALL_SUBSTATE = 23;

    private static final int MSG_SET_EXTRAS = 24;

    private static final int MSG_SET_EXTRAS = 24;

    private static final int MSG_ADD_EXISTING_CONNECTION = 25;

    private static final int MSG_ADD_EXISTING_CONNECTION = 25;

    private static final int MSG_SET_PHONE_ACCOUNT = 21;

    private static final int MSG_SET_CALL_PROPERTIES = 26;

    private static final int MSG_SET_CALL_PROPERTIES = 22;





    private final IConnectionServiceAdapter mDelegate;

    private final IConnectionServiceAdapter mDelegate;

telecomm/java/android/telecom/ParcelableCall.java

+1 −5
Original line number Original line Diff line number Diff line
@@ -278,7 +278,6 @@ public final class ParcelableCall implements Parcelable { 
            Bundle extras = source.readParcelable(classLoader);

            Bundle extras = source.readParcelable(classLoader);

            int notificationType = source.readInt();

            int notificationType = source.readInt();

            int code = source.readInt();

            int code = source.readInt();

            boolean isActiveSub = (source.readInt() == 1) ? true : false;

            int callSubstate = source.readInt();

            int callSubstate = source.readInt();

            boolean isActiveSub = source.readInt() == 1;

            boolean isActiveSub = source.readInt() == 1;

            return new ParcelableCall(

            return new ParcelableCall(
@@ -302,11 +301,8 @@ public final class ParcelableCall implements Parcelable { 
                    videoState,

                    videoState,

                    conferenceableCallIds,

                    conferenceableCallIds,

                    extras,

                    extras,

                    notificationType,

                    code,

                    isActiveSub,

                    isActiveSub,

                    callSubstate,

                    callSubstate);

                    isActiveSub);

        }

        }





        @Override

        @Override