commit e17a2595bf140e13101e2f54a0da775f1793914a
author android-build-team Robot <android-build-team-robot@google.com> Thu Aug 16 02:14:09 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Aug 16 02:14:09 2018 +0000
tree 9d2cf874bb7982621da8e3ddfc96cc7305f8628d
parent cde20748aadd3ccbd95d6ac2eccce61cf2fc7810
parent 8f4e8a2f7c6790ddacc2defb327fa8577f0db519

Merge cherrypicks of [4787631, 4787901, 4785407, 4787495, 4788077, 4788078, 4788079, 4788280, 4787496, 4787137, 4786086, 4786087, 4786088, 4786089, 4786090, 4786091, 4787632, 4788320, 4785408] into pi-dr1-release

Change-Id: I4bfe17c544fbd4114e1fcc15b1438c9af3243fec

service/java/com/android/server/wifi/WifiMetrics.java

diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index a3bd169..534811d 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -26,6 +26,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.os.SystemProperties;
+
 import android.util.Base64;
 import android.util.Log;
 import android.util.Pair;
@@ -2150,6 +2152,7 @@
 
                 pw.println("mWifiLogProto.isMacRandomizationOn=" + mIsMacRandomizationOn);
                 pw.println("mWifiLogProto.scoreExperimentId=" + mWifiLogProto.scoreExperimentId);
+                pw.println("Hardware Version: " + SystemProperties.get("ro.boot.revision", ""));
             }
         }
     }
@@ -2449,6 +2452,7 @@
             mWifiLogProto.wifiPowerStats = mWifiPowerMetrics.buildProto();
             mWifiLogProto.wifiWakeStats = mWifiWakeMetrics.buildProto();
             mWifiLogProto.isMacRandomizationOn = mIsMacRandomizationOn;
+            mWifiLogProto.hardwareRevision = SystemProperties.get("ro.boot.revision", "");
         }
     }