commit 9102b10a00efa1d552fa2a7e6e47f858a50cf6fa
author Shuo Qian <shuoq@google.com> Wed Feb 20 01:08:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 20 01:08:03 2019 +0000
tree 673a4adac71f6d46a5c3bcac1d5395a222617eb2
parent b829ad7b17bd8d32ac91122711c39b58d1a730d0
parent 6473542b4d87177b9265f26e6ab6d295195fc348

Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"

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

diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java
index 73f0556..907dbbd 100644
--- a/telephony/java/android/telephony/ims/ImsCallProfile.java
+++ b/telephony/java/android/telephony/ims/ImsCallProfile.java
@@ -543,7 +543,8 @@
                 + ", emergencyServiceCategories=" + mEmergencyServiceCategories
                 + ", emergencyUrns=" + mEmergencyUrns
                 + ", emergencyCallRouting=" + mEmergencyCallRouting
-                + ", emergencyCallTesting=" + mEmergencyCallTesting + " }";
+                + ", emergencyCallTesting=" + mEmergencyCallTesting
+                + ", hasKnownUserIntentEmergency=" + mHasKnownUserIntentEmergency + " }";
     }
 
     @Override
@@ -562,6 +563,7 @@
         out.writeStringList(mEmergencyUrns);
         out.writeInt(mEmergencyCallRouting);
         out.writeBoolean(mEmergencyCallTesting);
+        out.writeBoolean(mHasKnownUserIntentEmergency);
     }
 
     private void readFromParcel(Parcel in) {
@@ -573,6 +575,7 @@
         mEmergencyUrns = in.createStringArrayList();
         mEmergencyCallRouting = in.readInt();
         mEmergencyCallTesting = in.readBoolean();
+        mHasKnownUserIntentEmergency = in.readBoolean();
     }
 
     public static final Creator<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() {