Merge Android 12 QPR 3 (0b8a9d63) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/QosCallbackTracker.java

+39 −72

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import java.net.InetAddress;
		import java.net.InetSocketAddress;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Map;

		@@ -185,15 +184,13 @@ public class QosCallbackTracker extends Handler {
		log("updateSessions: sessions size=" + sessions.size());

		int bearerState = DEDICATED_BEARER_EVENT_STATE_NONE;

		final List<QosBearerSession> sessionsToAdd = new ArrayList<>();
		final Map<Integer, QosBearerSession> incomingSessions = new HashMap<>();
		final HashSet<Integer> sessionsReportedToMetric = new HashSet<>();
		for (final QosBearerSession incomingSession : sessions) {
		int sessionId = incomingSession.getQosBearerSessionId();
		incomingSessions.put(sessionId, incomingSession);
		incomingSessions.put(incomingSession.getQosBearerSessionId(), incomingSession);

		final QosBearerSession existingSession = mQosBearerSessions.get(sessionId);
		final QosBearerSession existingSession = mQosBearerSessions.get(
		incomingSession.getQosBearerSessionId());
		for (final int callbackId : mCallbacksToFilter.keySet()) {
		final IFilter filter = mCallbacksToFilter.get(callbackId);

		@@ -217,31 +214,15 @@ public class QosCallbackTracker extends Handler {
		}
		}

		// this QosBearerSession has registered QosCallbackId
		if (!sessionsReportedToMetric.contains(sessionId) && incomingSessionMatch) {
		// this session has listener
		notifyMetricDedicatedBearerEvent(incomingSession, bearerState, true);
		sessionsReportedToMetric.add(sessionId);
		}
		}

		// this QosBearerSession does not have registered QosCallbackId
		if (!sessionsReportedToMetric.contains(sessionId)) {
		// no listener is registered to this session
		bearerState = DEDICATED_BEARER_EVENT_STATE_ADDED;
		notifyMetricDedicatedBearerEvent(incomingSession, bearerState, false);
		sessionsReportedToMetric.add(sessionId);
		notifyMetricDedicatedBearerEvent(incomingSession, filter, bearerState);
		}
		sessionsToAdd.add(incomingSession);
		}

		final List<Integer> sessionsToRemove = new ArrayList<>();
		sessionsReportedToMetric.clear();
		bearerState = DEDICATED_BEARER_EVENT_STATE_DELETED;
		// Find sessions that no longer exist
		for (final QosBearerSession existingSession : mQosBearerSessions.values()) {
		final int sessionId = existingSession.getQosBearerSessionId();
		if (!incomingSessions.containsKey(sessionId)) {
		if (!incomingSessions.containsKey(existingSession.getQosBearerSessionId())) {
		for (final int callbackId : mCallbacksToFilter.keySet()) {
		final IFilter filter = mCallbacksToFilter.get(callbackId);
		// The filter matches which means it was previously available, and now is
		@@ -249,15 +230,10 @@ public class QosCallbackTracker extends Handler {
		if (doFiltersMatch(existingSession, filter)) {
		bearerState = DEDICATED_BEARER_EVENT_STATE_DELETED;
		sendSessionLost(callbackId, existingSession);
		notifyMetricDedicatedBearerEvent(existingSession, bearerState, true);
		sessionsReportedToMetric.add(sessionId);
		}
		notifyMetricDedicatedBearerEvent(existingSession, filter, bearerState);
		}
		sessionsToRemove.add(sessionId);
		if (!sessionsReportedToMetric.contains(sessionId)) {
		notifyMetricDedicatedBearerEvent(existingSession, bearerState, false);
		sessionsReportedToMetric.add(sessionId);
		}
		sessionsToRemove.add(existingSession.getQosBearerSessionId());
		}
		}

		@@ -280,7 +256,6 @@ public class QosCallbackTracker extends Handler {

		private boolean matchesByLocalAddress(final @NonNull QosBearerFilter sessionFilter,
		final @NonNull IFilter filter) {
		if (sessionFilter.getLocalPortRange() == null) return false;
		for (final LinkAddress qosAddress : sessionFilter.getLocalAddresses()) {
		return filter.matchesLocalAddress(qosAddress.getAddress(),
		sessionFilter.getLocalPortRange().getStart(),
		@@ -291,7 +266,6 @@ public class QosCallbackTracker extends Handler {

		private boolean matchesByRemoteAddress(@NonNull QosBearerFilter sessionFilter,
		final @NonNull IFilter filter) {
		if (sessionFilter.getRemotePortRange() == null) return false;
		for (final LinkAddress qosAddress : sessionFilter.getRemoteAddresses()) {
		return filter.matchesRemoteAddress(qosAddress.getAddress(),
		sessionFilter.getRemotePortRange().getStart(),
		@@ -302,8 +276,6 @@ public class QosCallbackTracker extends Handler {

		private boolean matchesByRemoteAndLocalAddress(@NonNull QosBearerFilter sessionFilter,
		final @NonNull IFilter filter) {
		if (sessionFilter.getLocalPortRange() == null
		\|\| sessionFilter.getRemotePortRange() == null) return false;
		for (final LinkAddress remoteAddress : sessionFilter.getRemoteAddresses()) {
		for (final LinkAddress localAddress : sessionFilter.getLocalAddresses()) {
		return filter.matchesRemoteAddress(remoteAddress.getAddress(),
		@@ -331,21 +303,17 @@ public class QosCallbackTracker extends Handler {
		for (final QosBearerFilter sessionFilter : qosBearerSession.getQosBearerFilterList()) {
		if (!sessionFilter.getLocalAddresses().isEmpty()
		&& !sessionFilter.getRemoteAddresses().isEmpty()
		&& sessionFilter.getLocalPortRange() != null
		&& sessionFilter.getLocalPortRange().isValid()
		&& sessionFilter.getRemotePortRange() != null
		&& sessionFilter.getRemotePortRange().isValid()) {
		if (matchesByRemoteAndLocalAddress(sessionFilter, filter)) {
		qosFilter = getFilterByPrecedence(qosFilter, sessionFilter);
		}
		} else if (!sessionFilter.getRemoteAddresses().isEmpty()
		&& sessionFilter.getRemotePortRange() != null
		&& sessionFilter.getRemotePortRange().isValid()) {
		if (matchesByRemoteAddress(sessionFilter, filter)) {
		qosFilter = getFilterByPrecedence(qosFilter, sessionFilter);
		}
		} else if (!sessionFilter.getLocalAddresses().isEmpty()
		&& sessionFilter.getLocalPortRange() != null
		&& sessionFilter.getLocalPortRange().isValid()) {
		if (matchesByLocalAddress(sessionFilter, filter)) {
		qosFilter = getFilterByPrecedence(qosFilter, sessionFilter);
		@@ -359,8 +327,7 @@ public class QosCallbackTracker extends Handler {
		@NonNull IFilter filter) {
		QosBearerFilter qosBearerFilter = getMatchingQosBearerFilter(session, filter);
		List<InetSocketAddress> remoteAddresses = new ArrayList<>();
		if (qosBearerFilter.getRemoteAddresses().size() > 0
		&& qosBearerFilter.getRemotePortRange() != null) {
		if (qosBearerFilter.getRemoteAddresses().size() > 0) {
		remoteAddresses.add(
		new InetSocketAddress(qosBearerFilter.getRemoteAddresses().get(0).getAddress(),
		qosBearerFilter.getRemotePortRange().getStart()));
		@@ -443,38 +410,38 @@ public class QosCallbackTracker extends Handler {
		return 0;
		}

		private boolean doesLocalConnectionInfoExist(final QosBearerSession qosBearerSession) {
		for (final QosBearerFilter sessionFilter : qosBearerSession.getQosBearerFilterList()) {
		if (!sessionFilter.getLocalAddresses().isEmpty()
		&& sessionFilter.getLocalPortRange() != null
		&& sessionFilter.getLocalPortRange().isValid()) {
		return true;
		}
		}
		return false;
		private void notifyMetricDedicatedBearerEvent(final QosBearerSession session,
		final IFilter filter, final int bearerState) {

		int ratAtEnd;
		int qci;
		boolean localConnectionInfoReceived = false;
		boolean remoteConnectionInfoReceived = false;

		QosBearerFilter qosBearerFilter = getMatchingQosBearerFilter(session, filter);
		if (session.getQos() instanceof EpsQos) {
		ratAtEnd = TelephonyManager.NETWORK_TYPE_LTE;
		qci = ((EpsQos) session.getQos()).getQci();
		} else if (session.getQos() instanceof NrQos) {
		ratAtEnd = TelephonyManager.NETWORK_TYPE_NR;
		qci = ((NrQos) session.getQos()).get5Qi();
		} else {
		return;
		}

		private boolean doesRemoteConnectionInfoExist(final QosBearerSession qosBearerSession) {
		for (final QosBearerFilter sessionFilter : qosBearerSession.getQosBearerFilterList()) {
		if (!sessionFilter.getRemoteAddresses().isEmpty()
		&& sessionFilter.getRemotePortRange() != null
		&& sessionFilter.getRemotePortRange().isValid()) {
		return true;
		if (qosBearerFilter != null) {
		if (!qosBearerFilter.getLocalAddresses().isEmpty()
		&& qosBearerFilter.getLocalPortRange().isValid()) {
		localConnectionInfoReceived = true;
		}
		if (!qosBearerFilter.getRemoteAddresses().isEmpty()
		&& qosBearerFilter.getRemotePortRange().isValid()) {
		remoteConnectionInfoReceived = true;
		}
		return false;
		}

		private void notifyMetricDedicatedBearerEvent(final QosBearerSession session,
		final int bearerState, final boolean hasListener) {
		final int slotId = mPhoneId;
		int ratAtEnd = getRatInfoFromSessionInfo(session);
		int qci = getQCIFromSessionInfo(session);
		boolean localConnectionInfoReceived = doesLocalConnectionInfoExist(session);
		boolean remoteConnectionInfoReceived = doesRemoteConnectionInfoExist(session);

		mRcsStats.onImsDedicatedBearerEvent(slotId, ratAtEnd, qci, bearerState,
		localConnectionInfoReceived, remoteConnectionInfoReceived, hasListener);
		mRcsStats.onImsDedicatedBearerEvent(mPhoneId, ratAtEnd, qci, bearerState,
		localConnectionInfoReceived, remoteConnectionInfoReceived, true);
		}

		/**

src/java/com/android/internal/telephony/imsphone/ImsRttTextHandler.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -128,7 +128,16 @@ public class ImsRttTextHandler extends Handler {
		mReaderThread.start();
		break;
		case SEND_TO_INCALL:
		if (msg.obj == null) {
		Rlog.e(LOG_TAG, "RTT msg.obj is null. Ignoring.");
		return;
		}
		String messageToIncall = (String) msg.obj;
		if (mRttTextStream == null) {
		Rlog.e(LOG_TAG, "RTT text stream is null. Writing to in-call buffer.");
		mBufferedTextToIncall.append(messageToIncall);
		return;
		}
		try {
		mRttTextStream.write(messageToIncall);
		} catch (IOException e) {
		@@ -216,6 +225,21 @@ public class ImsRttTextHandler extends Handler {
		mReadNotifier = latch;
		}

		@VisibleForTesting
		public StringBuffer getBufferedTextToIncall() {
		return mBufferedTextToIncall;
		}

		@VisibleForTesting
		public void setRttTextStream(Connection.RttTextStream rttTextStream) {
		mRttTextStream = rttTextStream;
		}

		@VisibleForTesting
		public int getSendToIncall() {
		return SEND_TO_INCALL;
		}

		public String getNetworkBufferText() {
		return mBufferedTextToNetwork.toString();
		}

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

+8 −43

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import static com.android.internal.telephony.TelephonyStatsLog.IMS_REGISTRATION_
		import static com.android.internal.telephony.TelephonyStatsLog.IMS_REGISTRATION_TERMINATION;
		import static com.android.internal.telephony.TelephonyStatsLog.INCOMING_SMS;
		import static com.android.internal.telephony.TelephonyStatsLog.OUTGOING_SMS;
		import static com.android.internal.telephony.TelephonyStatsLog.PER_SIM_STATUS;
		import static com.android.internal.telephony.TelephonyStatsLog.PRESENCE_NOTIFY_EVENT;
		import static com.android.internal.telephony.TelephonyStatsLog.RCS_ACS_PROVISIONING_STATS;
		import static com.android.internal.telephony.TelephonyStatsLog.RCS_CLIENT_PROVISIONING_STATS;
		@@ -128,21 +127,14 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		.setCoolDownMillis(MIN_COOLDOWN_MILLIS)
		.build();

		private final PersistAtomsStorage mStorage;
		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) {
		this(context, new PersistAtomsStorage(context));
		}

		/** Allows dependency injection. Used during unit tests. */
		@VisibleForTesting
		public MetricsCollector(Context context,
		PersistAtomsStorage storage) {
		mStorage = storage;
		mStorage = new PersistAtomsStorage(context);
		mStatsManager = (StatsManager) context.getSystemService(Context.STATS_MANAGER);
		if (mStatsManager != null) {
		registerAtom(CELLULAR_DATA_SERVICE_SWITCH, POLICY_PULL_DAILY);
		@@ -171,7 +163,6 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		registerAtom(UCE_EVENT_STATS, POLICY_PULL_DAILY);
		registerAtom(PRESENCE_NOTIFY_EVENT, POLICY_PULL_DAILY);
		registerAtom(GBA_EVENT, POLICY_PULL_DAILY);
		registerAtom(PER_SIM_STATUS, null);

		Rlog.d(TAG, "registered");
		} else {
		@@ -181,6 +172,12 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		mAirplaneModeStats = new AirplaneModeStats(context);
		}

		/** Replaces the {@link PersistAtomsStorage} backing the puller. Used during unit tests. */
		@VisibleForTesting
		public void setPersistAtomsStorage(PersistAtomsStorage storage) {
		mStorage = storage;
		}

		/**
		* {@inheritDoc}
		*
		@@ -243,8 +240,6 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		return pullPresenceNotifyEvent(data);
		case GBA_EVENT:
		return pullGbaEvent(data);
		case PER_SIM_STATUS:
		return pullPerSimStatus(data);
		default:
		Rlog.e(TAG, String.format("unexpected atom ID %d", atomTag));
		return StatsManager.PULL_SKIP;
		@@ -644,36 +639,6 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		}
		}

		private int pullPerSimStatus(List<StatsEvent> data) {
		int result = StatsManager.PULL_SKIP;
		for (Phone phone : getPhonesIfAny()) {
		PerSimStatus perSimStatus = PerSimStatus.getCurrentState(phone);
		if (perSimStatus == null) {
		continue;
		}
		StatsEvent statsEvent = TelephonyStatsLog.buildStatsEvent(
		PER_SIM_STATUS,
		phone.getPhoneId(), // simSlotIndex
		perSimStatus.carrierId, // carrierId
		perSimStatus.phoneNumberSourceUicc, // phoneNumberSourceUicc
		perSimStatus.phoneNumberSourceCarrier, // phoneNumberSourceCarrier
		perSimStatus.phoneNumberSourceIms, // phoneNumberSourceIms
		perSimStatus.advancedCallingSettingEnabled, // volteEnabled
		perSimStatus.voWiFiSettingEnabled, // wfcEnabled
		perSimStatus.voWiFiModeSetting, // wfcMode
		perSimStatus.voWiFiRoamingModeSetting, // wfcRoamingMode
		perSimStatus.vtSettingEnabled, // videoCallingEnabled
		perSimStatus.dataRoamingEnabled, // dataRoamingEnabled
		perSimStatus.preferredNetworkType, // allowedNetworksByUser
		perSimStatus.disabled2g, // is2gDisabled
		perSimStatus.pin1Enabled, // isPin1Enabled
		perSimStatus.minimumVoltageClass); // simVoltageClass
		data.add(statsEvent);
		result = StatsManager.PULL_SUCCESS;
		}
		return result;
		}

		/** Registers a pulled atom ID {@code atomId} with optional {@code policy} for pulling. */
		private void registerAtom(int atomId, @Nullable StatsManager.PullAtomMetadata policy) {
		mStatsManager.setPullAtomCallback(atomId, policy, ConcurrentUtils.DIRECT_EXECUTOR, this);

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

deleted100644 → 0

+0 −241

File deleted.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/uicc/UiccSlot.java

+0 −52

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.internal.telephony.uicc;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.app.AlertDialog;
		import android.content.ActivityNotFoundException;
		@@ -45,10 +44,7 @@ import com.android.telephony.Rlog;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;

		/**
		@@ -62,17 +58,6 @@ public class UiccSlot extends Handler {
		"com.android.internal.telephony.uicc.ICC_CARD_ADDED";
		public static final int INVALID_PHONE_ID = -1;

		@Retention(RetentionPolicy.SOURCE)
		@IntDef(
		prefix = {"VOLTAGE_CLASS_"},
		value = {VOLTAGE_CLASS_UNKNOWN, VOLTAGE_CLASS_A, VOLTAGE_CLASS_B, VOLTAGE_CLASS_C})
		public @interface VoltageClass {}

		public static final int VOLTAGE_CLASS_UNKNOWN = 0;
		public static final int VOLTAGE_CLASS_A = 1;
		public static final int VOLTAGE_CLASS_B = 2;
		public static final int VOLTAGE_CLASS_C = 3;

		private final Object mLock = new Object();
		private boolean mActive;
		private boolean mStateIsUnknown = true;
		@@ -80,7 +65,6 @@ public class UiccSlot extends Handler {
		private Context mContext;
		private UiccCard mUiccCard;
		private boolean mIsEuicc;
		private @VoltageClass int mMinimumVoltageClass;
		private String mEid;
		private AnswerToReset mAtr;
		private boolean mIsRemovable;
		@@ -365,51 +349,15 @@ public class UiccSlot extends Handler {
		}
		}

		private void checkMinimumVoltageClass() {
		mMinimumVoltageClass = VOLTAGE_CLASS_UNKNOWN;
		if (mAtr == null) {
		return;
		}
		// Supported voltage classes are stored in the 5 least significant bits of the TA byte for
		// global interface.
		List<AnswerToReset.InterfaceByte> interfaceBytes = mAtr.getInterfaceBytes();
		for (int i = 0; i < interfaceBytes.size() - 1; i++) {
		if (interfaceBytes.get(i).getTD() != null
		&& (interfaceBytes.get(i).getTD() & AnswerToReset.T_MASK)
		== AnswerToReset.T_VALUE_FOR_GLOBAL_INTERFACE
		&& interfaceBytes.get(i + 1).getTA() != null) {
		byte ta = interfaceBytes.get(i + 1).getTA();
		if ((ta & 0x01) != 0) {
		mMinimumVoltageClass = VOLTAGE_CLASS_A;
		}
		if ((ta & 0x02) != 0) {
		mMinimumVoltageClass = VOLTAGE_CLASS_B;
		}
		if ((ta & 0x04) != 0) {
		mMinimumVoltageClass = VOLTAGE_CLASS_C;
		}
		return;
		}
		}
		// Use default value - only class A
		mMinimumVoltageClass = VOLTAGE_CLASS_A;
		}

		private void parseAtr(String atr) {
		mAtr = AnswerToReset.parseAtr(atr);
		checkIsEuiccSupported();
		checkMinimumVoltageClass();
		}

		public boolean isEuicc() {
		return mIsEuicc;
		}

		@VoltageClass
		public int getMinimumVoltageClass() {
		return mMinimumVoltageClass;
		}

		public boolean isActive() {
		return mActive;
		}