Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[IT01] Move power state stats logging out from NMS" am: 6557000a11 am: b5cf3d63f3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac33b23f3e6beb313d1fae0f36d5b99d001cb635
This commit is contained in:
Chiachang Wang
2020-12-15 08:12:36 +00:00
committed by Automerger Merge Worker
parent 2478855f1b b5cf3d63f3
commit c6036ee388
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -90,7 +90,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;
@@ -419,8 +418,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);
}
}
@@ -431,8 +428,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);
}
}

4
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -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) {