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

Commit ecc96af9 authored by Muhammad Qureshi's avatar Muhammad Qureshi
Browse files

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
parent b246be60

Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,14 @@ filegroup { 
    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 @@ java_library { 
        ":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",

    ],

src/java/com/android/internal/telephony/ServiceStateTracker.java

+1 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ import android.util.LocalLog; 
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 @@ public class ServiceStateTracker extends Handler { 
                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());

        }

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+12 −11
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import android.telephony.data.DataServiceCallback; 
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.PhoneFactory; 
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 class DataConnection extends StateMachine { 
        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 @@ public class DataConnection extends StateMachine { 
    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 @@ public class DataConnection extends StateMachine { 


        @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 @@ public class DataConnection extends StateMachine { 
    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 @@ public class DataConnection extends StateMachine { 
    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