Merge "Support disabling conference event package for testing." am: 9d112e8efc (17250cca) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,9 @@ public class ImsPhoneCall extends Call {

		@Override
		public List<ConferenceParticipant> getConferenceParticipants() {
		if (!mOwner.isConferenceEventPackageEnabled()) {
		return null;
		}
		ImsCall call = getImsCall();
		if (call == null) {
		return null;

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

+29 −0

Original line number	Diff line number	Diff line
		@@ -269,6 +269,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		*/
		private boolean mIsMonitoringConnectivity = false;

		/**
		* A test flag which can be used to disable processing of the conference event package data
		* received from the network.
		*/
		private boolean mIsConferenceEventPackageEnabled = true;

		/**
		* Network callback used to schedule the handover check when a wireless network connects.
		*/
		@@ -2832,6 +2838,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		List<ConferenceParticipant> participants) {
		if (DBG) log("onConferenceParticipantsStateChanged");

		if (!mIsConferenceEventPackageEnabled) {
		logi("onConferenceParticipantsStateChanged - CEP handling disabled");
		return;
		}

		ImsPhoneConnection conn = findConnection(call);
		if (conn != null) {
		updateConferenceParticipantsTiming(participants);
		@@ -3607,6 +3618,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		pw.println(" mVtDataUsageUidSnapshot=" + mVtDataUsageUidSnapshot);
		pw.println(" mCallQualityMetrics=" + mCallQualityMetrics);
		pw.println(" mCallQualityMetricsHistory=" + mCallQualityMetricsHistory);
		pw.println(" mIsConferenceEventPackageHandlingEnabled=" + mIsConferenceEventPackageEnabled);

		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		@@ -4287,4 +4299,21 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		public ImsPhone getPhone() {
		return mPhone;
		}

		/**
		* Sets whether CEP handling is enabled or disabled.
		* @param isEnabled
		*/
		public void setConferenceEventPackageEnabled(boolean isEnabled) {
		log("setConferenceEventPackageEnabled isEnabled=" + isEnabled);
		mIsConferenceEventPackageEnabled = isEnabled;
		}

		/**
		* @return {@code true} is conference event package handling is enabled, {@code false}
		* otherwise.
		*/
		public boolean isConferenceEventPackageEnabled() {
		return mIsConferenceEventPackageEnabled;
		}
		}