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

Commit b5cf3d63 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bb09a47670a4c1ff9fcf1da3adfd891575dc190
parents d779d994 6557000a

services/core/java/com/android/server/NetworkManagementService.java

+0 −5
Original line number Diff line number Diff line
@@ -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);

            }

        }

services/core/java/com/android/server/am/BatteryStatsService.java

+4 −0
Original line number Diff line number Diff line
@@ -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) {