Merge "Move NUM_GPS_SIGNAL_QUALITY_LEVELS to GnssSignalQuality" (8068b16f) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.app.job.JobParameters;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.location.GnssSignalQuality;
		import android.os.BatteryStatsManager.WifiState;
		import android.os.BatteryStatsManager.WifiSupplState;
		import android.server.ServerProtoEnums;
		@@ -47,7 +48,6 @@ import android.util.proto.ProtoOutputStream;
		import android.view.Display;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.location.gnssmetrics.GnssMetrics;
		import com.android.internal.os.BatterySipper;
		import com.android.internal.os.BatteryStatsHelper;

		@@ -5087,7 +5087,8 @@ public abstract class BatteryStats implements Parcelable {
		final String[] gpsSignalQualityDescription = new String[]{
		"poor (less than 20 dBHz): ",
		"good (greater than 20 dBHz): "};
		final int numGpsSignalQualityBins = Math.min(GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS,
		final int numGpsSignalQualityBins = Math.min(
		GnssSignalQuality.NUM_GNSS_SIGNAL_QUALITY_LEVELS,
		gpsSignalQualityDescription.length);
		for (int i=0; i<numGpsSignalQualityBins; i++) {
		final long time = getGpsSignalQualityTime(i, rawRealtime, which);

core/java/android/os/connectivity/GpsBatteryStats.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -15,11 +15,10 @@
		*/
		package android.os.connectivity;

		import android.location.GnssSignalQuality;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.internal.location.gnssmetrics.GnssMetrics;

		import java.util.Arrays;

		/**
		@@ -85,7 +84,7 @@ public final class GpsBatteryStats implements Parcelable {

		public void setTimeInGpsSignalQualityLevel(long[] t) {
		mTimeInGpsSignalQualityLevel = Arrays.copyOfRange(t, 0,
		Math.min(t.length, GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS));
		Math.min(t.length, GnssSignalQuality.NUM_GNSS_SIGNAL_QUALITY_LEVELS));
		return;
		}

		@@ -102,7 +101,7 @@ public final class GpsBatteryStats implements Parcelable {
		private void initialize() {
		mLoggingDurationMs = 0;
		mEnergyConsumedMaMs = 0;
		mTimeInGpsSignalQualityLevel = new long[GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS];
		mTimeInGpsSignalQualityLevel = new long[GnssSignalQuality.NUM_GNSS_SIGNAL_QUALITY_LEVELS];
		return;
		}
		}
		No newline at end of file

core/java/com/android/internal/os/BatteryStatsImpl.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.content.Intent;
		import android.content.IntentFilter;
		import android.database.ContentObserver;
		import android.hardware.usb.UsbManager;
		import android.location.GnssSignalQuality;
		import android.net.ConnectivityManager;
		import android.net.INetworkStatsService;
		import android.net.NetworkStats;
		@@ -97,7 +98,6 @@ import android.view.Display;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.location.gnssmetrics.GnssMetrics;
		import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidActiveTimeReader;
		import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidClusterTimeReader;
		import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidFreqTimeReader;
		@@ -895,7 +895,7 @@ public class BatteryStatsImpl extends BatteryStats {
		int mGpsSignalQualityBin = -1;
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		protected final StopwatchTimer[] mGpsSignalQualityTimer =
		new StopwatchTimer[GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS];
		new StopwatchTimer[GnssSignalQuality.NUM_GNSS_SIGNAL_QUALITY_LEVELS];

		int mPhoneSignalStrengthBin = -1;
		int mPhoneSignalStrengthBinRaw = -1;
		@@ -5049,7 +5049,7 @@ public class BatteryStatsImpl extends BatteryStats {
		if (mGpsNesting == 0) {
		return;
		}
		if (signalLevel < 0 \|\| signalLevel >= GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS) {
		if (signalLevel < 0 \|\| signalLevel >= mGpsSignalQualityTimer.length) {
		stopAllGpsSignalQualityTimersLocked(-1, elapsedRealtimeMs);
		return;
		}
		@@ -5460,7 +5460,7 @@ public class BatteryStatsImpl extends BatteryStats {
		}

		void stopAllGpsSignalQualityTimersLocked(int except, long elapsedRealtimeMs) {
		for (int i = 0; i < GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i = 0; i < mGpsSignalQualityTimer.length; i++) {
		if (i == except) {
		continue;
		}
		@@ -6911,7 +6911,7 @@ public class BatteryStatsImpl extends BatteryStats {

		@Override public long getGpsSignalQualityTime(int strengthBin,
		long elapsedRealtimeUs, int which) {
		if (strengthBin < 0 \|\| strengthBin >= GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS) {
		if (strengthBin < 0 \|\| strengthBin >= mGpsSignalQualityTimer.length) {
		return 0;
		}
		return mGpsSignalQualityTimer[strengthBin].getTotalTimeLocked(
		@@ -6927,7 +6927,7 @@ public class BatteryStatsImpl extends BatteryStats {
		double energyUsedMaMs = 0.0;
		final int which = STATS_SINCE_CHARGED;
		final long rawRealtimeUs = SystemClock.elapsedRealtime() * 1000;
		for(int i=0; i < GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for(int i=0; i < mGpsSignalQualityTimer.length; i++) {
		energyUsedMaMs
		+= mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_SIGNAL_QUALITY_BASED, i)
		* (getGpsSignalQualityTime(i, rawRealtimeUs, which) / 1000);
		@@ -10659,7 +10659,7 @@ public class BatteryStatsImpl extends BatteryStats {
		mOnBatteryTimeBase);
		}
		mWifiActiveTimer = new StopwatchTimer(mClocks, null, -900, null, mOnBatteryTimeBase);
		for (int i=0; i< GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i=0; i< mGpsSignalQualityTimer.length; i++) {
		mGpsSignalQualityTimer[i] = new StopwatchTimer(mClocks, null, -1000-i, null,
		mOnBatteryTimeBase);
		}
		@@ -11351,7 +11351,7 @@ public class BatteryStatsImpl extends BatteryStats {
		mWifiMulticastWakelockTimer.reset(false, elapsedRealtimeUs);
		mWifiActiveTimer.reset(false, elapsedRealtimeUs);
		mWifiActivity.reset(false, elapsedRealtimeUs);
		for (int i=0; i< GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i=0; i< mGpsSignalQualityTimer.length; i++) {
		mGpsSignalQualityTimer[i].reset(false, elapsedRealtimeUs);
		}
		mBluetoothActivity.reset(false, elapsedRealtimeUs);
		@@ -13641,7 +13641,7 @@ public class BatteryStatsImpl extends BatteryStats {
		final long rawRealTimeUs = SystemClock.elapsedRealtime() * 1000;
		s.setLoggingDurationMs(computeBatteryRealtime(rawRealTimeUs, which) / 1000);
		s.setEnergyConsumedMaMs(getGpsBatteryDrainMaMs());
		long[] time = new long[GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS];
		long[] time = new long[mGpsSignalQualityTimer.length];
		for (int i=0; i<time.length; i++) {
		time[i] = getGpsSignalQualityTime(i, rawRealTimeUs, which) / 1000;
		}
		@@ -14692,7 +14692,7 @@ public class BatteryStatsImpl extends BatteryStats {
		}
		mWifiActiveTimer.readSummaryFromParcelLocked(in);
		mWifiActivity.readSummaryFromParcel(in);
		for (int i=0; i<GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i=0; i<mGpsSignalQualityTimer.length; i++) {
		mGpsSignalQualityTimer[i].readSummaryFromParcelLocked(in);
		}
		mBluetoothActivity.readSummaryFromParcel(in);
		@@ -15178,7 +15178,7 @@ public class BatteryStatsImpl extends BatteryStats {
		}
		mWifiActiveTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
		mWifiActivity.writeSummaryToParcel(out);
		for (int i=0; i< GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i=0; i< mGpsSignalQualityTimer.length; i++) {
		mGpsSignalQualityTimer[i].writeSummaryFromParcelLocked(out, NOWREAL_SYS);
		}
		mBluetoothActivity.writeSummaryToParcel(out);
		@@ -15672,7 +15672,7 @@ public class BatteryStatsImpl extends BatteryStats {
		mOnBatteryTimeBase, in);
		mWifiActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
		NUM_WIFI_TX_LEVELS, in);
		for (int i=0; i<GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i=0; i<mGpsSignalQualityTimer.length; i++) {
		mGpsSignalQualityTimer[i] = new StopwatchTimer(mClocks, null, -1000-i,
		null, mOnBatteryTimeBase, in);
		}
		@@ -15886,7 +15886,7 @@ public class BatteryStatsImpl extends BatteryStats {
		}
		mWifiActiveTimer.writeToParcel(out, uSecRealtime);
		mWifiActivity.writeToParcel(out, 0);
		for (int i = 0; i < GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i = 0; i < mGpsSignalQualityTimer.length; i++) {
		mGpsSignalQualityTimer[i].writeToParcel(out, uSecRealtime);
		}
		mBluetoothActivity.writeToParcel(out, 0);
		@@ -16197,7 +16197,7 @@ public class BatteryStatsImpl extends BatteryStats {
		pr.println("*** Wifi signal strength #" + i + ":");
		mWifiSignalStrengthsTimer[i].logState(pr, " ");
		}
		for (int i=0; i<GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i=0; i<mGpsSignalQualityTimer.length; i++) {
		pr.println("*** GPS signal quality #" + i + ":");
		mGpsSignalQualityTimer[i].logState(pr, " ");
		}

core/java/com/android/internal/os/SensorPowerCalculator.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -17,12 +17,11 @@ package com.android.internal.os;

		import android.hardware.Sensor;
		import android.hardware.SensorManager;
		import android.location.GnssSignalQuality;
		import android.os.BatteryStats;
		import android.os.UserHandle;
		import android.util.SparseArray;

		import com.android.internal.location.gnssmetrics.GnssMetrics;

		import java.util.List;

		public class SensorPowerCalculator extends PowerCalculator {
		@@ -83,7 +82,7 @@ public class SensorPowerCalculator extends PowerCalculator {
		averagePower = 0;
		long totalTime = 0;
		double totalPower = 0;
		for (int i = 0; i < GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i = 0; i < GnssSignalQuality.NUM_GNSS_SIGNAL_QUALITY_LEVELS; i++) {
		long timePerLevel = stats.getGpsSignalQualityTime(i, rawRealtimeUs, statsType);
		totalTime += timePerLevel;
		totalPower +=

core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,11 +16,11 @@

		package com.android.internal.os;

		import android.location.GnssSignalQuality;
		import android.os.Handler;
		import android.os.Looper;
		import android.util.SparseIntArray;

		import com.android.internal.location.gnssmetrics.GnssMetrics;
		import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidActiveTimeReader;
		import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidClusterTimeReader;
		import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidFreqTimeReader;
		@@ -47,7 +47,7 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl {
		mBluetoothScanTimer = new StopwatchTimer(mClocks, null, -14, null, mOnBatteryTimeBase);
		setExternalStatsSyncLocked(new DummyExternalStatsSync());

		for (int i = 0; i < GnssMetrics.NUM_GPS_SIGNAL_QUALITY_LEVELS; i++) {
		for (int i = 0; i < GnssSignalQuality.NUM_GNSS_SIGNAL_QUALITY_LEVELS; i++) {
		mGpsSignalQualityTimer[i] = new StopwatchTimer(clocks, null, -1000 - i, null,
		mOnBatteryTimeBase);
		}