From 39d9dc0fcf64cb9f9146de7d0ef8f49250895709 Mon Sep 17 00:00:00 2001
From: Chiachang Wang <chiachangwang@google.com>
Date: Thu, 10 Dec 2020 19:32:29 +0800
Subject: [PATCH] [IT01] Move power state stats logging out from NMS

In order to support ConnectivityService mainline, the dependency
with NMS should be removed. The idle timer control API should be
replaced with calling INetd interface instead of using NMS hidden
API. However, NMS has more logic than setting the idle timer to
netd. If CS would like to send idle timer setting to netd directly
, those logic should be handled by CS itself or moved to other
equivalent places.

The power state is sent to BatterystatsService and logged the
corresponding metrics at the same time, so writing metrics should
be able to put together inside BatteryStatsService.

Bug: 170598012
Test: m and use statsd_testdrive to verify
Change-Id: Iadfa3671ed34bf403be8b53eb47f83386b22c85a
---
 .../java/com/android/server/NetworkManagementService.java    | 5 -----
 .../core/java/com/android/server/am/BatteryStatsService.java | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index 5e86f855c1e70..24507ff256429 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -91,7 +91,6 @@ import android.util.SparseIntArray;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.util.DumpUtils;
-import com.android.internal.util.FrameworkStatsLog;
 import com.android.internal.util.HexDump;
 import com.android.internal.util.Preconditions;
 
@@ -420,8 +419,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
                     getBatteryStats().noteMobileRadioPowerState(powerState, tsNanos, uid);
                 } catch (RemoteException e) {
                 }
-                FrameworkStatsLog.write_non_chained(
-                        FrameworkStatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, null, powerState);
             }
         }
 
@@ -432,8 +429,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
                     getBatteryStats().noteWifiRadioPowerState(powerState, tsNanos, uid);
                 } catch (RemoteException e) {
                 }
-                FrameworkStatsLog.write_non_chained(
-                        FrameworkStatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, null, powerState);
             }
         }
 
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 090ac5467c680..1ade8e7e9311f 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -688,6 +688,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub
         if (update) {
             mWorker.scheduleSync("modem-data", BatteryExternalStatsWorker.UPDATE_RADIO);
         }
+        FrameworkStatsLog.write_non_chained(
+                FrameworkStatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, null, powerState);
     }
 
     public void notePhoneOn() {
@@ -869,6 +871,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub
             }
             mStats.noteWifiRadioPowerState(powerState, tsNanos, uid);
         }
+        FrameworkStatsLog.write_non_chained(
+                FrameworkStatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, null, powerState);
     }
 
     public void noteWifiRunning(WorkSource ws) {