Migrate to TelephonyStatsLog from StatsLog
As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by *StatsLog.java
that is autogenerated for each module.
This CL adds autogenerated TelephonylStatsLog and replaces usages
of StatsLog with TelephonyStatsLog.
Bug: 145952197
Test: m
Change-Id: I7d926a3f3650240e82bfab2bbc17ff6ce6af52cc
diff --git a/Android.bp b/Android.bp
index b9ddc08..94c399a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,14 @@
srcs: ["jarjar-rules-shared.txt"],
}
+genrule {
+ name: "statslog-telephony-java-gen",
+ tools: ["stats-log-api-gen"],
+ cmd: "$(location stats-log-api-gen) --java $(out) --module telephony"
+ + " --javaPackage com.android.internal.telephony --javaClass TelephonyStatsLog",
+ out: ["com/android/internal/telephony/TelephonyStatsLog.java"],
+}
+
android_app {
name: "telephony-resources",
installable: true,
@@ -72,6 +80,7 @@
":opt-telephony-common-srcs",
":framework-telephony-common-shared-srcs",
":net-utils-telephony-common-srcs",
+ ":statslog-telephony-java-gen",
"src/java/**/I*.aidl",
"src/java/**/*.logtags",
],
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 6507c7e..e080132 100755
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -87,7 +87,6 @@
import android.util.Pair;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
-import android.util.StatsLog;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
@@ -3336,7 +3335,7 @@
Context.TELEPHONY_SERVICE);
if (anyDataRatChanged) {
tm.setDataNetworkTypeForPhone(mPhone.getPhoneId(), mSS.getRilDataRadioTechnology());
- StatsLog.write(StatsLog.MOBILE_RADIO_TECHNOLOGY_CHANGED,
+ TelephonyStatsLog.write(TelephonyStatsLog.MOBILE_RADIO_TECHNOLOGY_CHANGED,
ServiceState.rilRadioTechnologyToNetworkType(
mSS.getRilDataRadioTechnology()), mPhone.getPhoneId());
}
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index dc2efbc..07912f4 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -62,7 +62,6 @@
import android.text.TextUtils;
import android.util.LocalLog;
import android.util.Pair;
-import android.util.StatsLog;
import android.util.TimeUtils;
import com.android.internal.annotations.VisibleForTesting;
@@ -76,6 +75,7 @@
import com.android.internal.telephony.RILConstants;
import com.android.internal.telephony.RetryManager;
import com.android.internal.telephony.ServiceStateTracker;
+import com.android.internal.telephony.TelephonyStatsLog;
import com.android.internal.telephony.dataconnection.DcTracker.ReleaseNetworkType;
import com.android.internal.telephony.dataconnection.DcTracker.RequestNetworkType;
import com.android.internal.telephony.metrics.TelephonyMetrics;
@@ -1764,8 +1764,8 @@
public void enter() {
mTag += 1;
if (DBG) log("DcInactiveState: enter() mTag=" + mTag);
- StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
- StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__INACTIVE,
+ TelephonyStatsLog.write(TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED,
+ TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__INACTIVE,
mPhone.getPhoneId(), mId,
mApnSetting != null ? (long) mApnSetting.getApnTypeBitmask() : 0L,
mApnSetting != null
@@ -1904,8 +1904,8 @@
private class DcActivatingState extends State {
@Override
public void enter() {
- StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
- StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVATING,
+ TelephonyStatsLog.write(TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED,
+ TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVATING,
mPhone.getPhoneId(), mId,
mApnSetting != null ? (long) mApnSetting.getApnTypeBitmask() : 0L,
mApnSetting != null
@@ -2028,8 +2028,8 @@
@Override public void enter() {
if (DBG) log("DcActiveState: enter dc=" + DataConnection.this);
- StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
- StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVE,
+ TelephonyStatsLog.write(TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED,
+ TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVE,
mPhone.getPhoneId(), mId,
mApnSetting != null ? (long) mApnSetting.getApnTypeBitmask() : 0L,
mApnSetting != null
@@ -2490,8 +2490,8 @@
private class DcDisconnectingState extends State {
@Override
public void enter() {
- StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
- StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTING,
+ TelephonyStatsLog.write(TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED,
+ TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTING,
mPhone.getPhoneId(), mId,
mApnSetting != null ? (long) mApnSetting.getApnTypeBitmask() : 0L,
mApnSetting != null
@@ -2548,8 +2548,9 @@
private class DcDisconnectionErrorCreatingConnection extends State {
@Override
public void enter() {
- StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
- StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTION_ERROR_CREATING_CONNECTION,
+ TelephonyStatsLog.write(TelephonyStatsLog.MOBILE_CONNECTION_STATE_CHANGED,
+ TelephonyStatsLog
+ .MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTION_ERROR_CREATING_CONNECTION,
mPhone.getPhoneId(), mId,
mApnSetting != null ? (long) mApnSetting.getApnTypeBitmask() : 0L,
mApnSetting != null