summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sanket Padawe <sanketpadawe@google.com> 2016-06-07 20:52:58 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-07 20:52:59 +0000
commit2e9b43efd53fbbce733b6e5c328f37c635c699a3 (patch)
treed4f3d0b8cef2bc82db0f34bbdf4837f19f3d7e36
parentcc12064670c9e0ade3ffcb4ff2eed4ddd5d267a8 (diff)
parentb9f0053b0c55af05cae8556e2e6ff54a38cf73ab (diff)
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
-rw-r--r--telephony/java/android/telephony/TelephonyHistogram.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyHistogram.java b/telephony/java/android/telephony/TelephonyHistogram.java
index 985102c63ada..9d9ce72dc068 100644
--- a/telephony/java/android/telephony/TelephonyHistogram.java
+++ b/telephony/java/android/telephony/TelephonyHistogram.java
@@ -274,7 +274,7 @@ public final class TelephonyHistogram implements Parcelable {
out.writeInt(minTimeMs);
out.writeInt(maxTimeMs);
out.writeInt(averageTimeMs);
- out.writeLong(sampleCount);
+ out.writeInt(sampleCount);
if (initialTimings == null) {
out.writeInt(ABSENT);
} else {