commit 2e9b43efd53fbbce733b6e5c328f37c635c699a3
author Sanket Padawe <sanketpadawe@google.com> Tue Jun 07 20:52:58 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 07 20:52:59 2016 +0000
tree d4f3d0b8cef2bc82db0f34bbdf4837f19f3d7e36
parent cc12064670c9e0ade3ffcb4ff2eed4ddd5d267a8
parent b9f0053b0c55af05cae8556e2e6ff54a38cf73ab

Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev

telephony/java/android/telephony/TelephonyHistogram.java

diff --git a/telephony/java/android/telephony/TelephonyHistogram.java b/telephony/java/android/telephony/TelephonyHistogram.java
index 985102c..9d9ce72 100644
--- a/telephony/java/android/telephony/TelephonyHistogram.java
+++ b/telephony/java/android/telephony/TelephonyHistogram.java
@@ -274,7 +274,7 @@
         out.writeInt(minTimeMs);
         out.writeInt(maxTimeMs);
         out.writeInt(averageTimeMs);
-        out.writeLong(sampleCount);
+        out.writeInt(sampleCount);
         if (initialTimings == null) {
             out.writeInt(ABSENT);
         } else {