commit f04714c59a5ad92e79bb037372f90213e46a92e8
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 04 11:44:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 04 11:44:21 2018 +0000
tree d208de042c10ddb369072dd9d58e99a7de66d19e
parent 459888be84a1a351ab906d23834e8f6661f8ed0b
parent 3cd5e3d9bbb3255e874b8fa27d7ed506164905dd

Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev

core/java/android/bluetooth/le/PeriodicAdvertisingReport.java

diff --git a/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java b/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java
index 51b93cb..6fc8d55 100644
--- a/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java
+++ b/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java
@@ -71,7 +71,7 @@
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(syncHandle);
-        dest.writeLong(txPower);
+        dest.writeInt(txPower);
         dest.writeInt(rssi);
         dest.writeInt(dataStatus);
         if (data != null) {