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

Commit 9102b10a authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"

parents b829ad7b 6473542b

telephony/java/android/telephony/ims/ImsCallProfile.java

+4 −1
Original line number Diff line number Diff line
@@ -543,7 +543,8 @@ public final class ImsCallProfile implements Parcelable { 
                + ", emergencyServiceCategories=" + mEmergencyServiceCategories

                + ", emergencyUrns=" + mEmergencyUrns

                + ", emergencyCallRouting=" + mEmergencyCallRouting

                + ", emergencyCallTesting=" + mEmergencyCallTesting + " }";

                + ", emergencyCallTesting=" + mEmergencyCallTesting

                + ", hasKnownUserIntentEmergency=" + mHasKnownUserIntentEmergency + " }";

    }



    @Override
@@ -562,6 +563,7 @@ public final class ImsCallProfile implements Parcelable { 
        out.writeStringList(mEmergencyUrns);

        out.writeInt(mEmergencyCallRouting);

        out.writeBoolean(mEmergencyCallTesting);

        out.writeBoolean(mHasKnownUserIntentEmergency);

    }



    private void readFromParcel(Parcel in) {
@@ -573,6 +575,7 @@ public final class ImsCallProfile implements Parcelable { 
        mEmergencyUrns = in.createStringArrayList();

        mEmergencyCallRouting = in.readInt();

        mEmergencyCallTesting = in.readBoolean();

        mHasKnownUserIntentEmergency = in.readBoolean();

    }



    public static final Creator<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() {