Snap for 8822995 from a78cc88dd1c0cfb70a63f56f93498c86b5848928 to tm-qpr1-release (82868a3e) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,7 @@ import com.android.internal.telephony.data.AccessNetworksManager;
	import com.android.internal.telephony.data.DataNetwork;		import com.android.internal.telephony.data.DataNetwork;
	import com.android.internal.telephony.data.DataNetworkController.DataNetworkControllerCallback;		import com.android.internal.telephony.data.DataNetworkController.DataNetworkControllerCallback;
	import com.android.internal.telephony.dataconnection.DataConnection;		import com.android.internal.telephony.dataconnection.DataConnection;
			import com.android.internal.telephony.imsphone.ImsPhone;
	import com.android.internal.telephony.metrics.ServiceStateStats;		import com.android.internal.telephony.metrics.ServiceStateStats;
	import com.android.internal.telephony.metrics.TelephonyMetrics;		import com.android.internal.telephony.metrics.TelephonyMetrics;
	import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
	@@ -1702,6 +1703,10 @@ public class ServiceStateTracker extends Handler {
	TelephonyMetrics.getInstance().writeServiceStateChanged(		TelephonyMetrics.getInstance().writeServiceStateChanged(
	mPhone.getPhoneId(), mSS);		mPhone.getPhoneId(), mSS);
	mPhone.getVoiceCallSessionStats().onServiceStateChanged(mSS);		mPhone.getVoiceCallSessionStats().onServiceStateChanged(mSS);
			ImsPhone imsPhone = (ImsPhone) mPhone.getImsPhone();
			if (imsPhone != null) {
			imsPhone.getImsStats().onServiceStateChanged(mSS);
			}
	mServiceStateStats.onServiceStateChanged(mSS);		mServiceStateStats.onServiceStateChanged(mSS);
	}		}
	}		}
	@@ -3838,6 +3843,10 @@ public class ServiceStateTracker extends Handler {

	TelephonyMetrics.getInstance().writeServiceStateChanged(mPhone.getPhoneId(), mSS);		TelephonyMetrics.getInstance().writeServiceStateChanged(mPhone.getPhoneId(), mSS);
	mPhone.getVoiceCallSessionStats().onServiceStateChanged(mSS);		mPhone.getVoiceCallSessionStats().onServiceStateChanged(mSS);
			ImsPhone imsPhone = (ImsPhone) mPhone.getImsPhone();
			if (imsPhone != null) {
			imsPhone.getImsStats().onServiceStateChanged(mSS);
			}
	mServiceStateStats.onServiceStateChanged(mSS);		mServiceStateStats.onServiceStateChanged(mSS);
	}		}

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

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ import android.os.SystemClock;
	import android.telephony.AccessNetworkConstants;		import android.telephony.AccessNetworkConstants;
	import android.telephony.AccessNetworkConstants.TransportType;		import android.telephony.AccessNetworkConstants.TransportType;
	import android.telephony.Annotation.NetworkType;		import android.telephony.Annotation.NetworkType;
			import android.telephony.ServiceState;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	import android.telephony.ims.ImsReasonInfo;		import android.telephony.ims.ImsReasonInfo;
	import android.telephony.ims.ProvisioningManager;		import android.telephony.ims.ProvisioningManager;
	@@ -196,7 +197,7 @@ public class ImsStats {

	private long mLastTimestamp;		private long mLastTimestamp;
	@Nullable private ImsRegistrationStats mLastRegistrationStats;		@Nullable private ImsRegistrationStats mLastRegistrationStats;
			@TransportType int mLastTransportType = AccessNetworkConstants.TRANSPORT_TYPE_INVALID;
	// Available features are those reported by ImsService to be available for use.		// Available features are those reported by ImsService to be available for use.
	private MmTelCapabilities mLastAvailableFeatures = new MmTelCapabilities();		private MmTelCapabilities mLastAvailableFeatures = new MmTelCapabilities();

	@@ -265,6 +266,10 @@ public class ImsStats {

	boolean ratChanged = false;		boolean ratChanged = false;
	@NetworkType int newRat = convertRegistrationTechToNetworkType(radioTech);		@NetworkType int newRat = convertRegistrationTechToNetworkType(radioTech);
			mLastTransportType =
			(newRat == TelephonyManager.NETWORK_TYPE_IWLAN)
			? AccessNetworkConstants.TRANSPORT_TYPE_WLAN
			: AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
	if (mLastRegistrationStats != null && mLastRegistrationStats.rat != newRat) {		if (mLastRegistrationStats != null && mLastRegistrationStats.rat != newRat) {
	mLastRegistrationStats.rat = newRat;		mLastRegistrationStats.rat = newRat;
	ratChanged = true;		ratChanged = true;
	@@ -301,6 +306,7 @@ public class ImsStats {
	public synchronized void onImsRegistering(@TransportType int imsRadioTech) {		public synchronized void onImsRegistering(@TransportType int imsRadioTech) {
	conclude();		conclude();

			mLastTransportType = imsRadioTech;
	mLastRegistrationStats = getDefaultImsRegistrationStats();		mLastRegistrationStats = getDefaultImsRegistrationStats();
	mLastRegistrationStats.rat = convertTransportTypeToNetworkType(imsRadioTech);		mLastRegistrationStats.rat = convertTransportTypeToNetworkType(imsRadioTech);
	mLastRegistrationState = REGISTRATION_STATE_REGISTERING;		mLastRegistrationState = REGISTRATION_STATE_REGISTERING;
	@@ -310,6 +316,7 @@ public class ImsStats {
	public synchronized void onImsRegistered(@TransportType int imsRadioTech) {		public synchronized void onImsRegistered(@TransportType int imsRadioTech) {
	conclude();		conclude();

			mLastTransportType = imsRadioTech;
	// NOTE: mLastRegistrationStats can be null (no registering phase).		// NOTE: mLastRegistrationStats can be null (no registering phase).
	if (mLastRegistrationStats == null) {		if (mLastRegistrationStats == null) {
	mLastRegistrationStats = getDefaultImsRegistrationStats();		mLastRegistrationStats = getDefaultImsRegistrationStats();
	@@ -347,6 +354,14 @@ public class ImsStats {
	mLastAvailableFeatures = new MmTelCapabilities();		mLastAvailableFeatures = new MmTelCapabilities();
	}		}

			/** Updates the RAT when service state changes. */
			public synchronized void onServiceStateChanged(ServiceState state) {
			if (mLastTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN
			&& mLastRegistrationStats != null) {
			mLastRegistrationStats.rat = ServiceStateStats.getDataRat(state);
			}
			}

	/**		/**
	* Returns the current RAT used for IMS voice registration, or {@link		* Returns the current RAT used for IMS voice registration, or {@link
	* TelephonyManager#NETWORK_TYPE_UNKNOWN} if there isn't any.		* TelephonyManager#NETWORK_TYPE_UNKNOWN} if there isn't any.

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

+0 −82

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,6 @@ import android.telephony.ims.FeatureTagState;
	import android.telephony.ims.RcsContactPresenceTuple;		import android.telephony.ims.RcsContactPresenceTuple;
	import android.telephony.ims.RcsContactUceCapability;		import android.telephony.ims.RcsContactUceCapability;
	import android.telephony.ims.aidl.IRcsConfigCallback;		import android.telephony.ims.aidl.IRcsConfigCallback;
	import android.util.Base64;
	import android.util.IndentingPrintWriter;		import android.util.IndentingPrintWriter;

	import com.android.ims.rcs.uce.UceStatsWriter;		import com.android.ims.rcs.uce.UceStatsWriter;
	@@ -83,7 +82,6 @@ import com.android.telephony.Rlog;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Arrays;
	import java.util.HashMap;		import java.util.HashMap;
	import java.util.HashSet;		import java.util.HashSet;
	import java.util.List;		import java.util.List;
	@@ -1777,84 +1775,4 @@ public class RcsStats {
	}		}
	pw.decreaseIndent();		pw.decreaseIndent();
	}		}

	/**
	* Reset all events
	*/
	public synchronized void reset() {
	if (mAtomsStorage == null \|\| mAtomsStorage.mAtoms == null) {
	return;
	}

	PersistAtomsProto.PersistAtoms metricAtoms = mAtomsStorage.mAtoms;

	metricAtoms.imsRegistrationFeatureTagStats =
	PersistAtomsProto.ImsRegistrationFeatureTagStats.emptyArray();
	metricAtoms.rcsClientProvisioningStats =
	PersistAtomsProto.RcsClientProvisioningStats.emptyArray();
	metricAtoms.rcsAcsProvisioningStats =
	PersistAtomsProto.RcsAcsProvisioningStats.emptyArray();
	metricAtoms.sipDelegateStats = PersistAtomsProto.SipDelegateStats.emptyArray();
	metricAtoms.sipTransportFeatureTagStats =
	PersistAtomsProto.SipTransportFeatureTagStats.emptyArray();
	metricAtoms.sipMessageResponse = PersistAtomsProto.SipMessageResponse.emptyArray();
	metricAtoms.sipTransportSession = PersistAtomsProto.SipTransportSession.emptyArray();
	metricAtoms.imsDedicatedBearerListenerEvent =
	PersistAtomsProto.ImsDedicatedBearerListenerEvent.emptyArray();
	metricAtoms.imsDedicatedBearerEvent =
	PersistAtomsProto.ImsDedicatedBearerEvent.emptyArray();
	metricAtoms.imsRegistrationServiceDescStats =
	PersistAtomsProto.ImsRegistrationServiceDescStats.emptyArray();
	metricAtoms.uceEventStats = PersistAtomsProto.UceEventStats.emptyArray();
	metricAtoms.presenceNotifyEvent = PersistAtomsProto.PresenceNotifyEvent.emptyArray();
	metricAtoms.gbaEvent = PersistAtomsProto.GbaEvent.emptyArray();
	}

	/**
	* Convert the PersistAtomsProto into Base-64 encoded string
	*
	* @return Encoded string
	*/
	public String buildLog() {
	PersistAtomsProto.PersistAtoms log = buildProto();
	return Base64.encodeToString(
	PersistAtomsProto.PersistAtoms.toByteArray(log), Base64.DEFAULT);
	}

	/**
	* Build the PersistAtomsProto
	*
	* @return PersistAtomsProto.PersistAtoms
	*/
	public PersistAtomsProto.PersistAtoms buildProto() {
	PersistAtomsProto.PersistAtoms log = new PersistAtomsProto.PersistAtoms();

	PersistAtomsProto.PersistAtoms atoms = mAtomsStorage.mAtoms;
	log.imsRegistrationFeatureTagStats = Arrays.copyOf(atoms.imsRegistrationFeatureTagStats,
	atoms.imsRegistrationFeatureTagStats.length);
	log.rcsClientProvisioningStats = Arrays.copyOf(atoms.rcsClientProvisioningStats,
	atoms.rcsClientProvisioningStats.length);
	log.rcsAcsProvisioningStats = Arrays.copyOf(atoms.rcsAcsProvisioningStats,
	atoms.rcsAcsProvisioningStats.length);
	log.sipDelegateStats = Arrays.copyOf(atoms.sipDelegateStats, atoms.sipDelegateStats.length);
	log.sipTransportFeatureTagStats = Arrays.copyOf(atoms.sipTransportFeatureTagStats,
	atoms.sipTransportFeatureTagStats.length);
	log.sipMessageResponse = Arrays.copyOf(atoms.sipMessageResponse,
	atoms.sipMessageResponse.length);
	log.sipTransportSession = Arrays.copyOf(atoms.sipTransportSession,
	atoms.sipTransportSession.length);
	log.imsDedicatedBearerListenerEvent = Arrays.copyOf(atoms.imsDedicatedBearerListenerEvent,
	atoms.imsDedicatedBearerListenerEvent.length);
	log.imsDedicatedBearerEvent = Arrays.copyOf(atoms.imsDedicatedBearerEvent,
	atoms.imsDedicatedBearerEvent.length);
	log.imsRegistrationServiceDescStats = Arrays.copyOf(atoms.imsRegistrationServiceDescStats,
	atoms.imsRegistrationServiceDescStats.length);
	log.uceEventStats = Arrays.copyOf(atoms.uceEventStats, atoms.uceEventStats.length);
	log.presenceNotifyEvent = Arrays.copyOf(atoms.presenceNotifyEvent,
	atoms.presenceNotifyEvent.length);
	log.gbaEvent = Arrays.copyOf(atoms.gbaEvent, atoms.gbaEvent.length);

	return log;
	}

	}		}

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -290,14 +290,12 @@ public class TelephonyMetrics {
	break;		break;
	case "--metricsproto":		case "--metricsproto":
	pw.println(convertProtoToBase64String(buildProto()));		pw.println(convertProtoToBase64String(buildProto()));
	pw.println(RcsStats.getInstance().buildLog());
	if (reset) {		if (reset) {
	reset();		reset();
	}		}
	break;		break;
	case "--metricsprototext":		case "--metricsprototext":
	pw.println(buildProto().toString());		pw.println(buildProto().toString());
	pw.println(RcsStats.getInstance().buildProto().toString());
	break;		break;
	}		}
	}		}
	@@ -749,8 +747,6 @@ public class TelephonyMetrics {
	.setRadioState(mLastRadioState.get(key)).build();		.setRadioState(mLastRadioState.get(key)).build();
	addTelephonyEvent(event);		addTelephonyEvent(event);
	}		}

	RcsStats.getInstance().reset();
	}		}

	/**		/**

tests/telephonytests/src/com/android/internal/telephony/metrics/ImsStatsTest.java

+36 −0

Original line number	Original line	Diff line number	Diff line
	@@ -869,4 +869,40 @@ public class ImsStatsTest extends TelephonyTest {

	assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, mImsStats.getImsVoiceRadioTech());		assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, mImsStats.getImsVoiceRadioTech());
	}		}

			@Test
			@SmallTest
			public void getImsVoiceRadioTech_serviceStateChanged() throws Exception {
			mImsStats.onImsRegistered(TRANSPORT_TYPE_WWAN);
			mImsStats.onImsCapabilitiesChanged(
			REGISTRATION_TECH_LTE, new MmTelCapabilities(CAPABILITY_TYPE_VOICE));
			doReturn(
			new NetworkRegistrationInfo.Builder()
			.setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_NR)
			.setRegistrationState(
			NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
			.build())
			.when(mServiceState)
			.getNetworkRegistrationInfo(DOMAIN_PS, TRANSPORT_TYPE_WWAN);
			mImsStats.onServiceStateChanged(mServiceState);
			assertEquals(TelephonyManager.NETWORK_TYPE_NR, mImsStats.getImsVoiceRadioTech());
			}

			@Test
			@SmallTest
			public void getImsVoiceRadioTech_serviceStateChanged_wlan() throws Exception {
			mImsStats.onImsRegistered(TRANSPORT_TYPE_WWAN);
			mImsStats.onImsCapabilitiesChanged(
			REGISTRATION_TECH_IWLAN, new MmTelCapabilities(CAPABILITY_TYPE_VOICE));
			doReturn(
			new NetworkRegistrationInfo.Builder()
			.setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_NR)
			.setRegistrationState(
			NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
			.build())
			.when(mServiceState)
			.getNetworkRegistrationInfo(DOMAIN_PS, TRANSPORT_TYPE_WWAN);
			mImsStats.onServiceStateChanged(mServiceState);
			assertEquals(TelephonyManager.NETWORK_TYPE_IWLAN, mImsStats.getImsVoiceRadioTech());
			}
	}		}