diff options
author | Jack Yu <jackyu@google.com> | 2016-10-21 12:16:06 -0700 |
---|---|---|
committer | Jack Yu <jackyu@google.com> | 2016-10-21 12:16:06 -0700 |
commit | d009ecff130b903cd597621b60ec84cddc0c4f16 (patch) | |
tree | ad89c6820e0e35d7e3f2e940916055cee35fccaf /src/java/com/android | |
parent | 722f9a0f024c05ddc4cc7384f924e35be666fc07 (diff) | |
download | android_frameworks_opt_telephony-d009ecff130b903cd597621b60ec84cddc0c4f16.tar.gz android_frameworks_opt_telephony-d009ecff130b903cd597621b60ec84cddc0c4f16.tar.bz2 android_frameworks_opt_telephony-d009ecff130b903cd597621b60ec84cddc0c4f16.zip |
Update the proto and service state logging.
1. Update the proto so the version used on the device is
in sync with the version on the server.
2. Added CDMA service state logging in pollStateDoneCdma() and
pollStateDoneCdmaLte().
bug: 31224848
Change-Id: I7c56f4c23ebc0db126d44e9a119ad71289781ca1
Diffstat (limited to 'src/java/com/android')
-rw-r--r-- | src/java/com/android/internal/telephony/ServiceStateTracker.java | 4 | ||||
-rw-r--r-- | src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java index 6dc02a807..f42304e1a 100644 --- a/src/java/com/android/internal/telephony/ServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java @@ -2970,6 +2970,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) { @@ -3204,6 +3206,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 || diff --git a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java index b4615ab52..92e3f0af7 100644 --- a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java +++ b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java @@ -269,6 +269,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); } @@ -325,7 +327,12 @@ public class TelephonyMetrics { if (event.hasType()) { pw.print("T="); - pw.print(telephonyEventToString(event.getType())); + 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(""); } @@ -347,7 +354,12 @@ public class TelephonyMetrics { for (TelephonyCallSession.Event event : callSession.events) { pw.print(event.getDelay()); pw.print(" T="); - pw.println(callSessionEventToString(event.getType())); + 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(); } |