Merge "Add the ability to get subId for RcsFeatureManager" (3aef2a66) · Commits · e / os / frameworks_opt_net_ims

src/java/com/android/ims/RcsFeatureManager.java

+3 −27

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,6 @@ import android.telephony.ims.aidl.ISipTransport;
	import android.telephony.ims.aidl.ISubscribeResponseCallback;		import android.telephony.ims.aidl.ISubscribeResponseCallback;
	import android.telephony.ims.feature.CapabilityChangeRequest;		import android.telephony.ims.feature.CapabilityChangeRequest;
	import android.telephony.ims.feature.ImsFeature;		import android.telephony.ims.feature.ImsFeature;
	import android.telephony.ims.feature.RcsFeature;
	import android.telephony.ims.feature.RcsFeature.RcsImsCapabilities;		import android.telephony.ims.feature.RcsFeature.RcsImsCapabilities;
	import android.telephony.ims.stub.ImsRegistrationImplBase;		import android.telephony.ims.stub.ImsRegistrationImplBase;
	import android.util.Log;		import android.util.Log;
	@@ -604,38 +603,15 @@ public class RcsFeatureManager implements FeatureUpdates {
	mRcsFeatureConnection.updateFeatureCapabilities(capabilities);		mRcsFeatureConnection.updateFeatureCapabilities(capabilities);
	}		}

	/**
	* Testing interface used to mock SubscriptionManager in testing
	* @hide
	*/
	@VisibleForTesting
	public interface SubscriptionManagerProxy {
	/**
	* Mock-able interface for {@link SubscriptionManager#getSubId(int)} used for testing.
	*/
	int getSubId(int slotId);
	}

	public IImsConfig getConfig() {		public IImsConfig getConfig() {
	return mRcsFeatureConnection.getConfig();		return mRcsFeatureConnection.getConfig();
	}		}

	private static SubscriptionManagerProxy sSubscriptionManagerProxy
	= slotId -> {
	int[] subIds = SubscriptionManager.getSubId(slotId);
	if (subIds != null) {
	return subIds[0];
	}
	return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
	};

	/**		/**
	* Testing function used to mock SubscriptionManager in testing		* @return the subscription ID associated with this ImsService connection.
	* @hide
	*/		*/
	@VisibleForTesting		public int getSubId() {
	public static void setSubscriptionManager(SubscriptionManagerProxy proxy) {		return mRcsFeatureConnection.getSubId();
	sSubscriptionManagerProxy = proxy;
	}		}

	private void log(String s) {		private void log(String s) {