Partial CP of ag/10846962

CP to rvc-dev to avoid automerger conflicts for ag/11727208.

Test: m
Bug: 157186182
Change-Id: I1b2dc636b90e6a643a2d5722022671563955f96a
Merged-In: I1eb1dfb68190c68e896e87c5bea1f2ec44065e80

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

@@ -124,8 +124,6 @@ public class GnssMetrics {
     private long mL5SvStatusReportsUsedInFix;
     /** Stats manager service for reporting atoms */
     private StatsManager mStatsManager;
-    /** Pull atom callback, this is called when atom pull request occurs */
-    private StatsPullAtomCallbackImpl mPullAtomCallback;
     /* Statds Logging Variables Section End */
 
     public GnssMetrics(Context context, IBatteryStats stats) {
@@ -468,7 +466,7 @@ public class GnssMetrics {
     }
 
     /** Class for storing statistics */
-    private class Statistics {
+    private static class Statistics {
 
         private int mCount;
         private double mSum;
@@ -623,11 +621,11 @@ public class GnssMetrics {
     }
 
     private void registerGnssStats() {
-        mPullAtomCallback = new StatsPullAtomCallbackImpl();
+        StatsPullAtomCallbackImpl pullAtomCallback = new StatsPullAtomCallbackImpl();
         mStatsManager.setPullAtomCallback(
                 FrameworkStatsLog.GNSS_STATS,
                 null, // use default PullAtomMetadata values
-                BackgroundThread.getExecutor(), mPullAtomCallback);
+                BackgroundThread.getExecutor(), pullAtomCallback);
     }
 
     /**