Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AddRestrictCause"

Browse Source 
am: 7044350d98

Change-Id: Ia91efd83dd1461a4680e29e66163b3658a5791f3
This commit is contained in:
Youming Ye
2019-05-02 10:33:16 -07:00
committed by android-build-merger
parent d0457b20a2 7044350d98
commit cf583a5e91
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/ims/ImsCallProfile.java
View File

@@ -545,7 +545,8 @@ public final class ImsCallProfile implements Parcelable {
+ ", emergencyUrns=" + mEmergencyUrns + ", emergencyUrns=" + mEmergencyUrns
+ ", emergencyCallRouting=" + mEmergencyCallRouting + ", emergencyCallRouting=" + mEmergencyCallRouting
+ ", emergencyCallTesting=" + mEmergencyCallTesting + ", emergencyCallTesting=" + mEmergencyCallTesting
+ ", hasKnownUserIntentEmergency=" + mHasKnownUserIntentEmergency + " }"; + ", hasKnownUserIntentEmergency=" + mHasKnownUserIntentEmergency
+ ", mRestrictCause=" + mRestrictCause + " }";
} }
@Override @Override
@@ -565,6 +566,7 @@ public final class ImsCallProfile implements Parcelable {
out.writeInt(mEmergencyCallRouting); out.writeInt(mEmergencyCallRouting);
out.writeBoolean(mEmergencyCallTesting); out.writeBoolean(mEmergencyCallTesting);
out.writeBoolean(mHasKnownUserIntentEmergency); out.writeBoolean(mHasKnownUserIntentEmergency);
out.writeInt(mRestrictCause);
} }
private void readFromParcel(Parcel in) { private void readFromParcel(Parcel in) {
@@ -577,6 +579,7 @@ public final class ImsCallProfile implements Parcelable {
mEmergencyCallRouting = in.readInt(); mEmergencyCallRouting = in.readInt();
mEmergencyCallTesting = in.readBoolean(); mEmergencyCallTesting = in.readBoolean();
mHasKnownUserIntentEmergency = in.readBoolean(); mHasKnownUserIntentEmergency = in.readBoolean();
mRestrictCause = in.readInt();
} }
public static final Creator<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() { public static final Creator<ImsCallProfile> CREATOR = new Creator<ImsCallProfile>() {