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

Commit 39489667 authored by Tej Singh's avatar Tej Singh
Browse files

Atoms: Mobile Connection 

Logging for MobileConnectionStateChanged and
MobileRadioTechnologyChanged

Bug: b/72320589
Test: verified logs appeared in adb logcat -b stats
Change-Id: I9b6f6d2505a807299b786b622ba477abe84bab61
parent d8ed98b7

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

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import android.util.EventLog; 
import android.util.LocalLog;

import android.util.Pair;

import android.util.SparseArray;

import android.util.StatsLog;

import android.util.TimeUtils;



import com.android.internal.annotations.VisibleForTesting;
@@ -2769,6 +2770,9 @@ public class ServiceStateTracker extends Handler { 


        if (hasRilDataRadioTechnologyChanged) {

            tm.setDataNetworkTypeForPhone(mPhone.getPhoneId(), mSS.getRilDataRadioTechnology());

            StatsLog.write(StatsLog.MOBILE_RADIO_TECHNOLOGY_CHANGED,

                    ServiceState.rilRadioTechnologyToNetworkType(mSS.getRilDataRadioTechnology()),

                    mPhone.getPhoneId());



            if (ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                    == mSS.getRilDataRadioTechnology()) {

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

+40 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.text.TextUtils; 
import android.util.LocalLog;

import android.util.Pair;

import android.util.SparseArray;

import android.util.StatsLog;

import android.util.TimeUtils;



import com.android.internal.annotations.VisibleForTesting;
@@ -1463,6 +1464,12 @@ 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,

                    mPhone.getPhoneId(), mId,

                    mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,

                    mApnSetting != null

                        ? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);



            if (mConnectionParams != null) {

                if (DBG) {
@@ -1552,6 +1559,15 @@ public class DataConnection extends StateMachine { 
     * The state machine is activating a connection.

     */

    private class DcActivatingState extends State {

        @Override

        public void enter() {

            StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,

                    StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVATING,

                    mPhone.getPhoneId(), mId,

                    mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,

                    mApnSetting != null

                        ? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);

        }

        @Override

        public boolean processMessage(Message msg) {

            boolean retVal;
@@ -1660,6 +1676,12 @@ 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,

                    mPhone.getPhoneId(), mId,

                    mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,

                    mApnSetting != null

                        ? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);



            updateNetworkInfo();
@@ -1949,6 +1971,15 @@ public class DataConnection extends StateMachine { 
     * The state machine is disconnecting.

     */

    private class DcDisconnectingState extends State {

        @Override

        public void enter() {

            StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,

                    StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTING,

                    mPhone.getPhoneId(), mId,

                    mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,

                    mApnSetting != null

                        ? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);

        }

        @Override

        public boolean processMessage(Message msg) {

            boolean retVal;
@@ -1998,6 +2029,15 @@ public class DataConnection extends StateMachine { 
     * The state machine is disconnecting after an creating a connection.

     */

    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,

                    mPhone.getPhoneId(), mId,

                    mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,

                    mApnSetting != null

                        ? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);

        }

        @Override

        public boolean processMessage(Message msg) {

            boolean retVal;