Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbfa3128 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add HW Revision to GNSS Metrics" into pi-dev am: b0b70b8e am: 66dcecd4"

parents 0ce0e0d7 0d5cb9a5

location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.location.gnssmetrics; 


import android.os.SystemClock;

import android.os.connectivity.GpsBatteryStats;

import android.os.SystemProperties;



import android.text.format.DateUtils;

import android.util.Base64;
@@ -175,6 +176,7 @@ public class GnssMetrics { 
          = topFourAverageCn0Statistics.getStandardDeviation();

    }

    msg.powerMetrics = mGnssPowerMetrics.buildProto();

    msg.hardwareRevision = SystemProperties.get("ro.boot.revision", "");

    String s = Base64.encodeToString(GnssLog.toByteArray(msg), Base64.DEFAULT);

    reset();

    return s;
@@ -239,6 +241,7 @@ public class GnssMetrics { 
      s.append("  Energy consumed while on battery (mAh): ").append(

          stats.getEnergyConsumedMaMs() / ((double) DateUtils.HOUR_IN_MILLIS)).append("\n");

    }

    s.append("Hardware Version: " + SystemProperties.get("ro.boot.revision", "")).append("\n");

    return s.toString();

  }

proto/src/gnss.proto

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ message GnssLog { 


  // Power metrics

  optional PowerMetrics power_metrics = 12;



  // Hardware revision (EVT, DVT, PVT etc.)

  optional string hardware_revision = 13;

}



// Power metrics