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

Commit 4d8d04d6 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Automerger Merge Worker
Browse files

Merge changes I6c0940fd,I1b2dc636 into rvc-dev am: 01d150e5 am: fdd1c9d0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727208

Change-Id: If1079a5caf03b1831ed829dc620a882f4b21e1e0
parents 51b0a49a fdd1c9d0

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ import android.util.TimeUtils; 
import com.android.internal.app.IBatteryStats;

import com.android.internal.app.IBatteryStats;

import com.android.internal.location.nano.GnssLogsProto.GnssLog;

import com.android.internal.location.nano.GnssLogsProto.GnssLog;

import com.android.internal.location.nano.GnssLogsProto.PowerMetrics;

import com.android.internal.location.nano.GnssLogsProto.PowerMetrics;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.FrameworkStatsLog;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -465,7 +465,7 @@ public class GnssMetrics { 
        mConstellationTypes = new boolean[GnssStatus.CONSTELLATION_COUNT];

        mConstellationTypes = new boolean[GnssStatus.CONSTELLATION_COUNT];

    }

    }





    /** Class for storing statistics */

    /** Thread-safe class for storing statistics */

    private static class Statistics {

    private static class Statistics {





        private int mCount;

        private int mCount;
@@ -474,7 +474,7 @@ public class GnssMetrics { 
        private long mLongSum;

        private long mLongSum;





        /** Resets statistics */

        /** Resets statistics */

        public void reset() {

        public synchronized void reset() {

            mCount = 0;

            mCount = 0;

            mSum = 0.0;

            mSum = 0.0;

            mSumSquare = 0.0;

            mSumSquare = 0.0;
@@ -482,7 +482,7 @@ public class GnssMetrics { 
        }

        }





        /** Adds an item */

        /** Adds an item */

        public void addItem(double item) {

        public synchronized void addItem(double item) {

            mCount++;

            mCount++;

            mSum += item;

            mSum += item;

            mSumSquare += item * item;

            mSumSquare += item * item;
@@ -490,17 +490,17 @@ public class GnssMetrics { 
        }

        }





        /** Returns number of items added */

        /** Returns number of items added */

        public int getCount() {

        public synchronized int getCount() {

            return mCount;

            return mCount;

        }

        }





        /** Returns mean */

        /** Returns mean */

        public double getMean() {

        public synchronized double getMean() {

            return mSum / mCount;

            return mSum / mCount;

        }

        }





        /** Returns standard deviation */

        /** Returns standard deviation */

        public double getStandardDeviation() {

        public synchronized double getStandardDeviation() {

            double m = mSum / mCount;

            double m = mSum / mCount;

            m = m * m;

            m = m * m;

            double v = mSumSquare / mCount;

            double v = mSumSquare / mCount;
@@ -511,7 +511,7 @@ public class GnssMetrics { 
        }

        }





        /** Returns long sum */

        /** Returns long sum */

        public long getLongSum() {

        public synchronized long getLongSum() {

            return mLongSum;

            return mLongSum;

        }

        }

    }

    }
@@ -625,7 +625,7 @@ public class GnssMetrics { 
        mStatsManager.setPullAtomCallback(

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.GNSS_STATS,

                FrameworkStatsLog.GNSS_STATS,

                null, // use default PullAtomMetadata values

                null, // use default PullAtomMetadata values

                BackgroundThread.getExecutor(), pullAtomCallback);

                ConcurrentUtils.DIRECT_EXECUTOR, pullAtomCallback);

    }

    }





    /**

    /**