Snap for 7842835 from a98ebe8bb420175b7e12c8aa07cde7ff3bde31cd to sc-v2-release (16c4e798) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3687,7 +3687,7 @@ public class DataConnection extends StateMachine {
		}
		}

		/** Sets the {@link DataCallSessionStats} mock for this phone ID during unit testing. */
		/** Sets the {@link DataCallSessionStats} mock for this data connection during unit testing. */
		@VisibleForTesting
		public void setDataCallSessionStats(DataCallSessionStats dataCallSessionStats) {
		mDataCallSessionStats = dataCallSessionStats;

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

+70 −13

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ public class DataCallSessionStats {
		public synchronized void onSetupDataCall(@ApnType int apnTypeBitMask) {
		mDataCallSession = getDefaultProto(apnTypeBitMask);
		mStartTime = getTimeMillis();
		PhoneFactory.getMetricsCollector().registerOngoingDataCallStat(this);
		}

		/**
		@@ -90,7 +91,15 @@ public class DataCallSessionStats {
		loge("onSetupDataCallResponse: no DataCallSession atom has been initiated.");
		return;
		}
		mDataCallSession.ratAtEnd = ServiceState.rilRadioTechnologyToNetworkType(radioTechnology);

		@NetworkType int currentRat = ServiceState.rilRadioTechnologyToNetworkType(radioTechnology);
		if (currentRat != TelephonyManager.NETWORK_TYPE_UNKNOWN) {
		mDataCallSession.ratAtEnd = currentRat;
		mDataCallSession.bandAtEnd =
		(currentRat == TelephonyManager.NETWORK_TYPE_IWLAN)
		? 0
		: ServiceStateStats.getBand(mPhone);
		}

		// only set if apn hasn't been set during setup
		if (mDataCallSession.apnTypeBitmask == 0) {
		@@ -105,8 +114,10 @@ public class DataCallSessionStats {
		// If setup has failed, then store the atom
		if (failureCause != DataFailCause.NONE) {
		mDataCallSession.failureCause = failureCause;
		mDataCallSession.oosAtEnd = getIsOos();
		mDataCallSession.setupFailed = true;
		mDataCallSession.ongoing = false;
		PhoneFactory.getMetricsCollector().unregisterOngoingDataCallStat(this);
		mAtomsStorage.addDataCallSession(mDataCallSession);
		mDataCallSession = null;
		}
		@@ -145,14 +156,17 @@ public class DataCallSessionStats {
		}
		}

		/** Stores the atom when DataConnection reaches DISCONNECTED state.
		/**
		* Stores the atom when DataConnection reaches DISCONNECTED state.
		*
		* @param failureCause failure cause as per android.telephony.DataFailCause
		**/
		*/
		public synchronized void onDataCallDisconnected(@DataFailureCause int failureCause) {
		// there should've been another call to initiate the atom,
		// so this method is being called out of order -> no atom will be saved
		// this also happens when DataConnection is created, which is expected
		if (mDataCallSession == null) {
		loge("onDataCallDisconnected: no DataCallSession atom has been initiated.");
		logi("onDataCallDisconnected: no DataCallSession atom has been initiated.");
		return;
		}
		mDataCallSession.failureCause = failureCause;
		@@ -161,6 +175,7 @@ public class DataCallSessionStats {
		mDataCallSession.durationMinutes = convertMillisToMinutes(getTimeMillis() - mStartTime);
		// store for the data call list event, after DataCall is disconnected and entered into
		// inactive mode
		PhoneFactory.getMetricsCollector().unregisterOngoingDataCallStat(this);
		mAtomsStorage.addDataCallSession(mDataCallSession);
		mDataCallSession = null;
		}
		@@ -172,14 +187,29 @@ public class DataCallSessionStats {
		* registration state change.
		*/
		public synchronized void onDrsOrRatChanged(@RilRadioTechnology int radioTechnology) {
		@NetworkType int currentRat =
		ServiceState.rilRadioTechnologyToNetworkType(radioTechnology);
		if (mDataCallSession != null
		&& currentRat != TelephonyManager.NETWORK_TYPE_UNKNOWN
		&& mDataCallSession.ratAtEnd != currentRat) {
		@NetworkType int currentRat = ServiceState.rilRadioTechnologyToNetworkType(radioTechnology);
		if (mDataCallSession != null && currentRat != TelephonyManager.NETWORK_TYPE_UNKNOWN) {
		if (mDataCallSession.ratAtEnd != currentRat) {
		mDataCallSession.ratSwitchCount++;
		mDataCallSession.ratAtEnd = currentRat;
		mDataCallSession.bandAtEnd = ServiceStateStats.getBand(mPhone, currentRat);
		}
		// band may have changed even if RAT was the same
		mDataCallSession.bandAtEnd =
		(currentRat == TelephonyManager.NETWORK_TYPE_IWLAN)
		? 0
		: ServiceStateStats.getBand(mPhone);
		}
		}

		/** Add the on-going data call segment to the atom storage. */
		public synchronized void conclude() {
		if (mDataCallSession != null) {
		DataCallSession call = copyOf(mDataCallSession);
		long nowMillis = getTimeMillis();
		call.durationMinutes = convertMillisToMinutes(nowMillis - mStartTime);
		mStartTime = nowMillis;
		mDataCallSession.ratSwitchCount = 0L;
		mAtomsStorage.addDataCallSession(call);
		}
		}

		@@ -187,6 +217,29 @@ public class DataCallSessionStats {
		return Math.round(millis / 60000.0);
		}

		private static DataCallSession copyOf(DataCallSession call) {
		DataCallSession copy = new DataCallSession();
		copy.dimension = call.dimension;
		copy.isMultiSim = call.isMultiSim;
		copy.isEsim = call.isEsim;
		copy.apnTypeBitmask = call.apnTypeBitmask;
		copy.carrierId = call.carrierId;
		copy.isRoaming = call.isRoaming;
		copy.ratAtEnd = call.ratAtEnd;
		copy.oosAtEnd = call.oosAtEnd;
		copy.ratSwitchCount = call.ratSwitchCount;
		copy.isOpportunistic = call.isOpportunistic;
		copy.ipType = call.ipType;
		copy.setupFailed = call.setupFailed;
		copy.failureCause = call.failureCause;
		copy.suggestedRetryMillis = call.suggestedRetryMillis;
		copy.deactivateReason = call.deactivateReason;
		copy.durationMinutes = call.durationMinutes;
		copy.ongoing = call.ongoing;
		copy.bandAtEnd = call.bandAtEnd;
		return copy;
		}

		/** Creates a proto for a normal {@code DataCallSession} with default values. */
		private DataCallSession getDefaultProto(@ApnType int apnTypeBitmask) {
		DataCallSession proto = new DataCallSession();
		@@ -230,6 +283,10 @@ public class DataCallSessionStats {
		: false;
		}

		private void logi(String format, Object... args) {
		Rlog.i(TAG, "[" + mPhone.getPhoneId() + "]" + String.format(format, args));
		}

		private void loge(String format, Object... args) {
		Rlog.e(TAG, "[" + mPhone.getPhoneId() + "]" + String.format(format, args));
		}

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

+19 −6

Original line number	Diff line number	Diff line
		@@ -35,22 +35,34 @@ public class DataStallRecoveryStats {
		* @param recoveryAction Data stall recovery action
		* @param phone
		*/
		public static void onDataStallEvent(@DcTracker.RecoveryAction int recoveryAction,
		Phone phone, boolean isRecovered, int durationMillis) {
		public static void onDataStallEvent(
		@DcTracker.RecoveryAction int recoveryAction,
		Phone phone,
		boolean isRecovered,
		int durationMillis) {
		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
		phone = phone.getDefaultPhone();
		}

		int carrierId = phone.getCarrierId();
		int rat = getRat(phone);
		int band = ServiceStateStats.getBand(phone, rat);
		int band =
		(rat == TelephonyManager.NETWORK_TYPE_IWLAN) ? 0 : ServiceStateStats.getBand(phone);
		// the number returned here matches the SignalStrength enum we have
		int signalStrength = phone.getSignalStrength().getLevel();
		boolean isOpportunistic = getIsOpportunistic(phone);
		boolean isMultiSim = SimSlotState.getCurrentState().numActiveSims > 1;

		TelephonyStatsLog.write(TelephonyStatsLog.DATA_STALL_RECOVERY_REPORTED, carrierId, rat,
		signalStrength, recoveryAction, isOpportunistic, isMultiSim, band, isRecovered,
		TelephonyStatsLog.write(
		TelephonyStatsLog.DATA_STALL_RECOVERY_REPORTED,
		carrierId,
		rat,
		signalStrength,
		recoveryAction,
		isOpportunistic,
		isMultiSim,
		band,
		isRecovered,
		durationMillis);
		}

		@@ -59,7 +71,8 @@ public class DataStallRecoveryStats {
		ServiceStateTracker serviceStateTracker = phone.getServiceStateTracker();
		ServiceState serviceState =
		serviceStateTracker != null ? serviceStateTracker.getServiceState() : null;
		return serviceState != null ? serviceState.getDataNetworkType()
		return serviceState != null
		? serviceState.getDataNetworkType()
		: TelephonyManager.NETWORK_TYPE_UNKNOWN;
		}

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

+31 −12

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ import android.os.SystemClock;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.Annotation.NetworkType;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyManager;
		import android.telephony.ims.ImsReasonInfo;
		import android.telephony.ims.ProvisioningManager;
		@@ -265,10 +263,24 @@ public class ImsStats {
		@ImsRegistrationTech int radioTech, MmTelCapabilities capabilities) {
		conclude();

		if (mLastRegistrationStats != null) {
		mLastRegistrationStats.rat = convertRegistrationTechToNetworkType(radioTech);
		boolean ratChanged = false;
		@NetworkType int newRat = convertRegistrationTechToNetworkType(radioTech);
		if (mLastRegistrationStats != null && mLastRegistrationStats.rat != newRat) {
		mLastRegistrationStats.rat = newRat;
		ratChanged = true;
		}

		boolean voiceAvailableNow = capabilities.isCapable(CAPABILITY_TYPE_VOICE);
		boolean voiceAvailabilityChanged =
		(mLastAvailableFeatures.isCapable(CAPABILITY_TYPE_VOICE) != voiceAvailableNow);
		mLastAvailableFeatures = capabilities;

		// Notify voice RAT change if 1. RAT changed while voice over IMS is available, or 2. voice
		// over IMS availability changed
		if ((ratChanged && voiceAvailableNow) \|\| voiceAvailabilityChanged) {
		mPhone.getDefaultPhone().getServiceStateTracker().getServiceStateStats()
		.onImsVoiceRegistrationChanged();
		}
		}

		/** Updates the stats when capable features changed. */
		@@ -335,6 +347,20 @@ public class ImsStats {
		mLastAvailableFeatures = new MmTelCapabilities();
		}

		/**
		* Returns the current RAT used for IMS voice registration, or {@link
		* TelephonyManager#NETWORK_TYPE_UNKNOWN} if there isn't any.
		*/
		@NetworkType
		@VisibleForTesting
		public synchronized int getImsVoiceRadioTech() {
		if (mLastRegistrationStats == null
		\|\| !mLastAvailableFeatures.isCapable(CAPABILITY_TYPE_VOICE)) {
		return TelephonyManager.NETWORK_TYPE_UNKNOWN;
		}
		return mLastRegistrationStats.rat;
		}

		@NetworkType
		private int getRatAtEnd(@NetworkType int lastStateRat) {
		return lastStateRat == TelephonyManager.NETWORK_TYPE_IWLAN ? lastStateRat : getWwanPsRat();
		@@ -354,14 +380,7 @@ public class ImsStats {

		@NetworkType
		private int getWwanPsRat() {
		ServiceState state = mPhone.getServiceStateTracker().getServiceState();
		final NetworkRegistrationInfo wwanRegInfo =
		state.getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS,
		AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		return wwanRegInfo != null
		? wwanRegInfo.getAccessNetworkTechnology()
		: TelephonyManager.NETWORK_TYPE_UNKNOWN;
		return ServiceStateStats.getDataRat(mPhone.getServiceStateTracker().getServiceState());
		}

		private ImsRegistrationStats getDefaultImsRegistrationStats() {

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

+21 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,8 @@ import java.util.Arrays;
		import java.util.Comparator;
		import java.util.List;
		import java.util.Random;
		import java.util.Set;
		import java.util.concurrent.ConcurrentHashMap;

		/**
		* Implements statsd pullers for Telephony.
		@@ -102,6 +104,7 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		private PersistAtomsStorage mStorage;
		private final StatsManager mStatsManager;
		private final AirplaneModeStats mAirplaneModeStats;
		private final Set<DataCallSessionStats> mOngoingDataCallStats = ConcurrentHashMap.newKeySet();
		private static final Random sRandom = new Random();

		public MetricsCollector(Context context) {
		@@ -183,6 +186,19 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		return mStorage;
		}

		/**
		* Registers a {@link DataCallSessionStats} which will be pinged for on-going data calls when
		* data call atoms are pulled.
		*/
		public void registerOngoingDataCallStat(DataCallSessionStats call) {
		mOngoingDataCallStats.add(call);
		}

		/** Unregisters a {@link DataCallSessionStats} when it no longer handles an active data call. */
		public void unregisterOngoingDataCallStat(DataCallSessionStats call) {
		mOngoingDataCallStats.remove(call);
		}

		private static int pullSimSlotState(List<StatsEvent> data) {
		SimSlotState state;
		try {
		@@ -289,6 +305,11 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		}

		private int pullDataCallSession(List<StatsEvent> data) {
		// Include ongoing data call segments
		for (DataCallSessionStats stats : mOngoingDataCallStats) {
		stats.conclude();
		}

		DataCallSession[] dataCallSessions = mStorage.getDataCallSessions(MIN_COOLDOWN_MILLIS);
		if (dataCallSessions != null) {
		Arrays.stream(dataCallSessions)