summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shuo Qian <shuoq@google.com> 2019-02-20 01:08:03 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-02-20 01:08:03 +0000
commit9102b10a00efa1d552fa2a7e6e47f858a50cf6fa (patch)
tree673a4adac71f6d46a5c3bcac1d5395a222617eb2
parentb829ad7b17bd8d32ac91122711c39b58d1a730d0 (diff)
parent6473542b4d87177b9265f26e6ab6d295195fc348 (diff)
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
-rw-r--r--telephony/java/android/telephony/ims/ImsCallProfile.java5
1 files changed, 4 insertions, 1 deletions
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<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() {