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

Commit c61514fb authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Update the proto and service state logging. am: d009ecff am: a1b456d5 

am: 557ef97a

Change-Id: If1b9a9d4dce2a7b414bb5319cc3fdbbe68644248
parents 782d1005 557ef97a

proto/telephony.proto

+7 −0
Original line number Diff line number Diff line
@@ -309,6 +309,8 @@ enum RadioAccessTechnology { 
  RAT_TD_SCDMA = 17;



  RAT_IWLAN = 18;



  RAT_LTE_CA = 19;

}



// The information about IMS errors
@@ -785,14 +787,19 @@ message TelephonyEvent { 
  // RIL error code

  optional RilErrno error = 9;



  // Setup data call request

  optional RilSetupDataCall setup_data_call = 10;



  // Setup data call response

  optional RilSetupDataCallResponse setup_data_call_response = 11;



  // Deactivate data call request

  optional RilDeactivateDataCall deactivate_data_call = 12;



  // Data call stall recovery action

  optional int32 data_stall_action = 13;



  // Modem restart event

  optional ModemRestart modem_restart = 14;



  // NITZ time in milliseconds

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

+4 −0
Original line number Diff line number Diff line
@@ -2971,6 +2971,8 @@ public class ServiceStateTracker extends Handler { 
            setRoamingType(mSS);

            log("Broadcasting ServiceState : " + mSS);

            mPhone.notifyServiceStateChanged(mSS);



            TelephonyMetrics.getInstance().writeServiceStateChanged(mPhone.getPhoneId(), mSS);

        }



        if (hasCdmaDataConnectionAttached || hasCdmaDataConnectionDetached || hasRegistered) {
@@ -3205,6 +3207,8 @@ public class ServiceStateTracker extends Handler { 
            setRoamingType(mSS);

            log("Broadcasting ServiceState : " + mSS);

            mPhone.notifyServiceStateChanged(mSS);



            TelephonyMetrics.getInstance().writeServiceStateChanged(mPhone.getPhoneId(), mSS);

        }



        if (hasCdmaDataConnectionAttached || has4gHandoff || hasCdmaDataConnectionDetached ||

src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java

+14 −2
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ public class TelephonyMetrics { 
                return "IMS_CALL_HANDOVER_FAILED";

            case TelephonyCallSession.Event.Type.PHONE_STATE_CHANGED:

                return "PHONE_STATE_CHANGED";

            case TelephonyCallSession.Event.Type.NITZ_TIME:

                return "NITZ_TIME";

            default:

                return Integer.toString(event);

        }
@@ -330,8 +332,13 @@ public class TelephonyMetrics { 


                if (event.hasType()) {

                    pw.print("T=");

                    if (event.getType() == TelephonyEvent.Type.RIL_SERVICE_STATE_CHANGED) {

                        pw.print(telephonyEventToString(event.getType())

                                + "(" + event.serviceState.getDataRat() + ")");

                    } else {

                        pw.print(telephonyEventToString(event.getType()));

                    }

                }

                pw.println("");

            }

        }
@@ -352,8 +359,13 @@ public class TelephonyMetrics { 
            for (TelephonyCallSession.Event event : callSession.events) {

                pw.print(event.getDelay());

                pw.print(" T=");

                if (event.getType() == TelephonyCallSession.Event.Type.RIL_SERVICE_STATE_CHANGED) {

                    pw.println(callSessionEventToString(event.getType())

                            + "(" + event.serviceState.getDataRat() + ")");

                } else {

                    pw.println(callSessionEventToString(event.getType()));

                }

            }

            pw.decreaseIndent();

        }