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

Commit b3ee8754 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use FrameworkStatsLog instead of StatsLog"

parents e77dc7a0 93891dd2

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

+5 −5
Original line number Diff line number Diff line
@@ -86,12 +86,12 @@ import android.util.Log; 
import android.util.Slog;

import android.util.SparseBooleanArray;

import android.util.SparseIntArray;

import android.util.StatsLog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

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;
@@ -411,8 +411,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
                    getBatteryStats().noteMobileRadioPowerState(powerState, tsNanos, uid);

                } catch (RemoteException e) {

                }

                StatsLog.write_non_chained(StatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, null,

                        powerState);

                FrameworkStatsLog.write_non_chained(

                        FrameworkStatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, null, powerState);

            }

        }
@@ -423,8 +423,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
                    getBatteryStats().noteWifiRadioPowerState(powerState, tsNanos, uid);

                } catch (RemoteException e) {

                }

                StatsLog.write_non_chained(StatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, null,

                        powerState);

                FrameworkStatsLog.write_non_chained(

                        FrameworkStatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, null, powerState);

            }

        }

services/core/java/com/android/server/connectivity/NetdEventListenerService.java

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ import android.text.format.DateUtils; 
import android.util.ArrayMap;

import android.util.Log;

import android.util.SparseArray;

import android.util.StatsLog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.BitUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.RingBuffer;

import com.android.internal.util.TokenBucket;

import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent;
@@ -278,7 +278,7 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
        addWakeupEvent(event);



        String dstMac = event.dstHwAddr.toString();

        StatsLog.write(StatsLog.PACKET_WAKEUP_OCCURRED,

        FrameworkStatsLog.write(FrameworkStatsLog.PACKET_WAKEUP_OCCURRED,

                uid, iface, ethertype, dstMac, srcIp, dstIp, ipNextHeader, srcPort, dstPort);

    }