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

Commit dbe28429 authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "AddRestrictCause" am: 7044350d 

am: cf583a5e

Change-Id: I07d30db922554d3a20029ddc84d2ef3af7d2b350
parents e327e850 cf583a5e

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

+4 −1
Original line number Diff line number Diff line
@@ -550,7 +550,8 @@ public final class ImsCallProfile implements Parcelable { 
                + ", emergencyUrns=" + mEmergencyUrns

                + ", emergencyCallRouting=" + mEmergencyCallRouting

                + ", emergencyCallTesting=" + mEmergencyCallTesting

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

                + ", hasKnownUserIntentEmergency=" + mHasKnownUserIntentEmergency

                + ", mRestrictCause=" + mRestrictCause + " }";

    }



    @Override
@@ -570,6 +571,7 @@ public final class ImsCallProfile implements Parcelable { 
        out.writeInt(mEmergencyCallRouting);

        out.writeBoolean(mEmergencyCallTesting);

        out.writeBoolean(mHasKnownUserIntentEmergency);

        out.writeInt(mRestrictCause);

    }



    private void readFromParcel(Parcel in) {
@@ -582,6 +584,7 @@ public final class ImsCallProfile implements Parcelable { 
        mEmergencyCallRouting = in.readInt();

        mEmergencyCallTesting = in.readBoolean();

        mHasKnownUserIntentEmergency = in.readBoolean();

        mRestrictCause = in.readInt();

    }



    public static final @android.annotation.NonNull Creator<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() {