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

Merge "Use FrameworkStatsLog instead of StatsLog" am: b3ee8754dd am: 075b51103e

Browse Source 
Change-Id: I955d4d487478166f36db27b3b198fb0d995271fe
This commit is contained in:
Automerger Merge Worker
2020-02-01 08:44:46 +00:00
parent e444680c96 075b51103e
commit ddcb51e926
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,12 +86,12 @@ import android.util.Log;
import android.util.Slog; import android.util.Slog;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import android.util.StatsLog;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IBatteryStats; import com.android.internal.app.IBatteryStats;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.util.HexDump; import com.android.internal.util.HexDump;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
@@ -411,8 +411,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
getBatteryStats().noteMobileRadioPowerState(powerState, tsNanos, uid); getBatteryStats().noteMobileRadioPowerState(powerState, tsNanos, uid);
} catch (RemoteException e) { } catch (RemoteException e) {
} }
StatsLog.write_non_chained(StatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, null, FrameworkStatsLog.write_non_chained(
powerState); FrameworkStatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, null, powerState);
} }
} }
@@ -423,8 +423,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
getBatteryStats().noteWifiRadioPowerState(powerState, tsNanos, uid); getBatteryStats().noteWifiRadioPowerState(powerState, tsNanos, uid);
} catch (RemoteException e) { } catch (RemoteException e) {
} }
StatsLog.write_non_chained(StatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, null, FrameworkStatsLog.write_non_chained(
powerState); FrameworkStatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, null, powerState);
} }
} }

4
services/core/java/com/android/server/connectivity/NetdEventListenerService.java
View File

@@ -35,11 +35,11 @@ import android.text.format.DateUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.StatsLog;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.BitUtils; import com.android.internal.util.BitUtils;
import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.util.RingBuffer; import com.android.internal.util.RingBuffer;
import com.android.internal.util.TokenBucket; import com.android.internal.util.TokenBucket;
import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent;
@@ -278,7 +278,7 @@ public class NetdEventListenerService extends INetdEventListener.Stub {
addWakeupEvent(event); addWakeupEvent(event);
String dstMac = event.dstHwAddr.toString(); 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); uid, iface, ethertype, dstMac, srcIp, dstIp, ipNextHeader, srcPort, dstPort);
} }