Snap for 5691653 from 20cba2d56e31ee91ef8bfbe3f2fe9d94fbfdeb79 to qt-c2f2-release (f5067677) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -245,9 +245,10 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		public void notifyPhysicalChannelConfiguration(Phone sender,
		List<PhysicalChannelConfig> configs) {
		int subId = sender.getSubId();
		int phoneId = sender.getPhoneId();
		try {
		if (mRegistry != null) {
		mRegistry.notifyPhysicalChannelConfigurationForSubscriber(subId, configs);
		mRegistry.notifyPhysicalChannelConfigurationForSubscriber(phoneId, subId, configs);
		}
		} catch (RemoteException ex) {
		// system process is dead

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

+17 −7

Original line number	Diff line number	Diff line
		@@ -354,11 +354,18 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		private long mCachedTime;
		private long mConnectTime;
		private long mConnectElapsedTime;
		/**
		* The direction of the call;
		* {@link android.telecom.Call.Details#DIRECTION_INCOMING} for incoming calls, or
		* {@link android.telecom.Call.Details#DIRECTION_OUTGOING} for outgoing calls.
		*/
		private int mCallDirection;

		CacheEntry(long cachedTime, long connectTime, long connectElapsedTime) {
		CacheEntry(long cachedTime, long connectTime, long connectElapsedTime, int callDirection) {
		mCachedTime = cachedTime;
		mConnectTime = connectTime;
		mConnectElapsedTime = connectElapsedTime;
		mCallDirection = callDirection;
		}
		}

		@@ -1335,8 +1342,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		}

		private void cacheConnectionTimeWithPhoneNumber(@NonNull ImsPhoneConnection connection) {
		int callDirection =
		connection.isIncoming() ? android.telecom.Call.Details.DIRECTION_INCOMING
		: android.telecom.Call.Details.DIRECTION_OUTGOING;
		CacheEntry cachedConnectTime = new CacheEntry(SystemClock.elapsedRealtime(),
		connection.getConnectTime(), connection.getConnectTimeReal());
		connection.getConnectTime(), connection.getConnectTimeReal(), callDirection);
		maintainConnectTimeCache();
		if (PhoneConstants.PRESENTATION_ALLOWED == connection.getNumberPresentation()) {
		// In case of merging calls with the same number, use the latest connect time. Since
		@@ -1364,13 +1374,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		return null;
		}

		String numParts = PhoneNumberUtils
		.extractNetworkPortion(participant.getHandle().getSchemeSpecificPart());
		if (TextUtils.isEmpty(numParts)) {
		String number = ConferenceParticipant.getParticipantAddress(participant.getHandle(),
		getCountryIso()).getSchemeSpecificPart();
		if (TextUtils.isEmpty(number)) {
		return null;
		}

		String formattedNumber = getFormattedPhoneNumber(numParts);
		String formattedNumber = getFormattedPhoneNumber(number);
		return mPhoneNumAndConnTime.get(formattedNumber);
		} else {
		return mUnknownPeerConnTime.poll();
		@@ -2749,6 +2758,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		if (cachedConnectTime != null) {
		participant.setConnectTime(cachedConnectTime.mConnectTime);
		participant.setConnectElapsedTime(cachedConnectTime.mConnectElapsedTime);
		participant.setCallDirection(cachedConnectTime.mCallDirection);
		}
		}
		}

tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -353,12 +353,7 @@ public class TelephonyRegistryMock extends ITelephonyRegistry.Stub {
		}

		@Override
		public void notifyPhysicalChannelConfiguration(List<PhysicalChannelConfig> configs) {
		throw new RuntimeException("Not implemented");
		}

		@Override
		public void notifyPhysicalChannelConfigurationForSubscriber(int subId,
		public void notifyPhysicalChannelConfigurationForSubscriber(int phoneId, int subId,
		List<PhysicalChannelConfig> configs) {
		throw new RuntimeException("Not implemented");
		}