commit 80a84c4aad172de67185e3ecee926df6a429a34a
author Pengquan Meng <mpq@google.com> Fri Mar 09 23:37:01 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 23:37:01 2018 +0000
tree 623ab284826b8c094cbb38d1a97d8d678509bdd6
parent 2c7272942845b51a390eb8a71872cb09536c7200
parent a61fe8f6c08bf0d02c0e54db7ffcabde79ea0c3e

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

telephony/java/com/android/internal/telephony/DcParamObject.java

diff --git a/telephony/java/com/android/internal/telephony/DcParamObject.java b/telephony/java/com/android/internal/telephony/DcParamObject.java
index 139939c..fc6b610 100644
--- a/telephony/java/com/android/internal/telephony/DcParamObject.java
+++ b/telephony/java/com/android/internal/telephony/DcParamObject.java
@@ -36,7 +36,7 @@
     }
 
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeLong(mSubId);
+        dest.writeInt(mSubId);
     }
 
     private void readFromParcel(Parcel in) {