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

Commit d666a8d9 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Move position of bundle parceling for PA extras."

parents fd5b7744 ef829ece

telecomm/java/android/telecom/PhoneAccount.java

+3 −4
Original line number Diff line number Diff line
@@ -584,9 +584,8 @@ public final class PhoneAccount implements Parcelable { 
            out.writeInt(1);

            mIcon.writeToParcel(out, flags);

        }



        out.writeBundle(mExtras);

        out.writeByte((byte) (mIsEnabled ? 1 : 0));

        out.writeBundle(mExtras);

    }



    public static final Creator<PhoneAccount> CREATOR
@@ -628,8 +627,8 @@ public final class PhoneAccount implements Parcelable { 
        } else {

            mIcon = null;

        }

        mExtras = in.readBundle();

        mIsEnabled = in.readByte() == 1;

        mExtras = in.readBundle();

    }



    @Override