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

Commit a310500f authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly." 

* commit '2dd63ccd':
  Parcel compRequired flag correctly.
parents f103e8bb 2dd63ccd

telephony/java/com/android/internal/telephony/cat/CommandDetails.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -48,13 +48,14 @@ class CommandDetails extends ValueObject implements Parcelable { 
    }

    }





    public CommandDetails(Parcel in) {

    public CommandDetails(Parcel in) {

        compRequired = true;

        compRequired = in.readInt() != 0;

        commandNumber = in.readInt();

        commandNumber = in.readInt();

        typeOfCommand = in.readInt();

        typeOfCommand = in.readInt();

        commandQualifier = in.readInt();

        commandQualifier = in.readInt();

    }

    }





    public void writeToParcel(Parcel dest, int flags) {

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(compRequired ? 1 : 0);

        dest.writeInt(commandNumber);

        dest.writeInt(commandNumber);

        dest.writeInt(typeOfCommand);

        dest.writeInt(typeOfCommand);

        dest.writeInt(commandQualifier);

        dest.writeInt(commandQualifier);