Merge "Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675 am: 5eb85f01d2 am: 037206683b" into pi-dev

am: b710e91bac Change-Id: I5510d16aea61e69bd3ca9b8e0920bddb30e62742
2018-03-10 04:40:28 +00:00
parent 14b5972391 b710e91bac
commit ce50f4a986
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/DcParamObject.java
+++ b/telephony/java/com/android/internal/telephony/DcParamObject.java
@@ -36,7 +36,7 @@ public class DcParamObject implements Parcelable {
    }

    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeLong(mSubId);
+        dest.writeInt(mSubId);
    }

    private void readFromParcel(Parcel in) {