From 6473542b4d87177b9265f26e6ab6d295195fc348 Mon Sep 17 00:00:00 2001 From: sqian Date: Thu, 14 Feb 2019 14:58:03 -0800 Subject: Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel Test: Treehugger Bug: 123999640 Change-Id: Ie68a02a7e0f9aabe5dbc37806a495169feb63765 Merged-In: Ie68a02a7e0f9aabe5dbc37806a495169feb63765 (cherry picked from commit 0c86fbf491f4781ef3be68ba51aa3bfdb0bd7bc0) --- telephony/java/android/telephony/ims/ImsCallProfile.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index 73f055649b3f..907dbbd20403 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -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 CREATOR = new Creator() { -- cgit v1.2.3-59-g8ed1b