Add MockModem to bind/unbind the mock service with different interfaces am:... (d914ac57) · Commits · e / os / android_frameworks_opt_telephony

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

0 → 100644

+356 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.ServiceConnection;
		import android.os.IBinder;

		import com.android.telephony.Rlog;

		/** This class provides wrapper APIs for binding interfaces to mock service. */
		public class MockModem {
		private static final String TAG = "MockModem";
		private static final String BIND_IRADIOMODEM = "android.telephony.cts.iradiomodem";
		private static final String BIND_IRADIOSIM = "android.telephony.cts.iradiosim";
		private static final String BIND_IRADIOMESSAGING = "android.telephony.cts.iradiomessaging";
		private static final String BIND_IRADIODATA = "android.telephony.cts.iradiodata";
		private static final String BIND_IRADIONETWORK = "android.telephony.cts.iradionetwork";
		private static final String BIND_IRADIOVOICE = "android.telephony.cts.iradiovoice";
		private static final String BIND_IRADIOCONFIG = "android.telephony.cts.iradioconfig";
		private static final String PHONE_ID = "phone_id";

		private static final byte DEFAULT_PHONE_ID = 0x00;

		static final int RADIOCONFIG_SERVICE = RIL.MAX_SERVICE_IDX + 1;

		static final int BINDER_RETRY_MILLIS = 3 * 100;
		static final int BINDER_MAX_RETRY = 3;

		private Context mContext;
		private String mServiceName;
		private String mPackageName;

		private IBinder mModemBinder;
		private IBinder mSimBinder;
		private IBinder mMessagingBinder;
		private IBinder mDataBinder;
		private IBinder mNetworkBinder;
		private IBinder mVoiceBinder;
		private IBinder mConfigBinder;
		private ServiceConnection mModemServiceConnection;
		private ServiceConnection mSimServiceConnection;
		private ServiceConnection mMessagingServiceConnection;
		private ServiceConnection mDataServiceConnection;
		private ServiceConnection mNetworkServiceConnection;
		private ServiceConnection mVoiceServiceConnection;
		private ServiceConnection mConfigServiceConnection;

		private byte mPhoneId;

		MockModem(Context context, String serviceName) {
		this(context, serviceName, 0);
		}

		MockModem(Context context, String serviceName, int phoneId) {
		mPhoneId = (byte) phoneId;
		mContext = context;
		mServiceName = serviceName;
		mPackageName = serviceName.substring(0, serviceName.lastIndexOf('.'));
		}

		private class MockModemConnection implements ServiceConnection {
		private int mService;

		MockModemConnection(int module) {
		mService = module;
		}

		@Override
		public void onServiceConnected(ComponentName name, IBinder binder) {
		Rlog.d(TAG, "IRadio " + getModuleName(mService) + " - onServiceConnected");

		if (mService == RIL.MODEM_SERVICE) {
		mModemBinder = binder;
		} else if (mService == RIL.SIM_SERVICE) {
		mSimBinder = binder;
		} else if (mService == RIL.MESSAGING_SERVICE) {
		mMessagingBinder = binder;
		} else if (mService == RIL.DATA_SERVICE) {
		mDataBinder = binder;
		} else if (mService == RIL.NETWORK_SERVICE) {
		mNetworkBinder = binder;
		} else if (mService == RIL.VOICE_SERVICE) {
		mVoiceBinder = binder;
		} else if (mService == RADIOCONFIG_SERVICE) {
		mConfigBinder = binder;
		}
		}

		@Override
		public void onServiceDisconnected(ComponentName name) {
		Rlog.d(TAG, "IRadio " + getModuleName(mService) + " - onServiceDisconnected");

		if (mService == RIL.MODEM_SERVICE) {
		mModemBinder = null;
		} else if (mService == RIL.SIM_SERVICE) {
		mSimBinder = null;
		} else if (mService == RIL.MESSAGING_SERVICE) {
		mMessagingBinder = null;
		} else if (mService == RIL.DATA_SERVICE) {
		mDataBinder = null;
		} else if (mService == RIL.NETWORK_SERVICE) {
		mNetworkBinder = null;
		} else if (mService == RIL.VOICE_SERVICE) {
		mVoiceBinder = null;
		} else if (mService == RADIOCONFIG_SERVICE) {
		mConfigBinder = null;
		}
		}
		}

		private boolean bindModuleToMockModemService(
		String actionName, ServiceConnection serviceConnection) {
		return bindModuleToMockModemService(DEFAULT_PHONE_ID, actionName, serviceConnection);
		}

		private boolean bindModuleToMockModemService(
		byte phoneId, String actionName, ServiceConnection serviceConnection) {
		boolean status = false;

		Intent intent = new Intent();
		intent.setClassName(mPackageName, mServiceName);
		intent.setAction(actionName);
		intent.putExtra(PHONE_ID, phoneId);

		status = mContext.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
		return status;
		}

		/** waitForBinder */
		public IBinder getServiceBinder(int service) {
		switch (service) {
		case RIL.MODEM_SERVICE:
		return mModemBinder;
		case RIL.SIM_SERVICE:
		return mSimBinder;
		case RIL.MESSAGING_SERVICE:
		return mMessagingBinder;
		case RIL.DATA_SERVICE:
		return mDataBinder;
		case RIL.NETWORK_SERVICE:
		return mNetworkBinder;
		case RIL.VOICE_SERVICE:
		return mVoiceBinder;
		case RADIOCONFIG_SERVICE:
		return mConfigBinder;
		default:
		return null;
		}
		}

		/** Binding interfaces with mock modem service */
		public void bindAllMockModemService() {
		for (int service = RIL.MIN_SERVICE_IDX; service <= RIL.MAX_SERVICE_IDX; service++) {
		bindToMockModemService(service);
		}
		}

		/** bindToMockModemService */
		public void bindToMockModemService(int service) {
		if (service == RADIOCONFIG_SERVICE) {
		if (mConfigBinder == null) {
		mConfigServiceConnection = new MockModemConnection(RADIOCONFIG_SERVICE);

		boolean status =
		bindModuleToMockModemService(BIND_IRADIOCONFIG, mConfigServiceConnection);
		if (!status) {
		Rlog.d(TAG, "IRadio Config bind fail");
		mConfigServiceConnection = null;
		}
		} else {
		Rlog.d(TAG, "IRadio Config is bound");
		}
		} else if (service == RIL.MODEM_SERVICE) {
		if (mModemBinder == null) {
		mModemServiceConnection = new MockModemConnection(RIL.MODEM_SERVICE);

		boolean status =
		bindModuleToMockModemService(
		mPhoneId, BIND_IRADIOMODEM, mModemServiceConnection);
		if (!status) {
		Rlog.d(TAG, "IRadio Modem bind fail");
		mModemServiceConnection = null;
		}
		} else {
		Rlog.d(TAG, "IRadio Modem is bound");
		}
		} else if (service == RIL.SIM_SERVICE) {
		if (mSimBinder == null) {
		mSimServiceConnection = new MockModemConnection(RIL.SIM_SERVICE);

		boolean status =
		bindModuleToMockModemService(
		mPhoneId, BIND_IRADIOSIM, mSimServiceConnection);
		if (!status) {
		Rlog.d(TAG, "IRadio Sim bind fail");
		mSimServiceConnection = null;
		}
		} else {
		Rlog.d(TAG, "IRadio Sim is bound");
		}
		} else if (service == RIL.MESSAGING_SERVICE) {
		if (mMessagingBinder == null) {
		mMessagingServiceConnection = new MockModemConnection(RIL.MESSAGING_SERVICE);

		boolean status =
		bindModuleToMockModemService(
		mPhoneId, BIND_IRADIOMESSAGING, mMessagingServiceConnection);
		if (!status) {
		Rlog.d(TAG, "IRadio Messaging bind fail");
		mMessagingServiceConnection = null;
		}
		} else {
		Rlog.d(TAG, "IRadio Messaging is bound");
		}
		} else if (service == RIL.DATA_SERVICE) {
		if (mDataBinder == null) {
		mDataServiceConnection = new MockModemConnection(RIL.DATA_SERVICE);

		boolean status =
		bindModuleToMockModemService(
		mPhoneId, BIND_IRADIODATA, mDataServiceConnection);
		if (!status) {
		Rlog.d(TAG, "IRadio Data bind fail");
		mDataServiceConnection = null;
		}
		} else {
		Rlog.d(TAG, "IRadio Data is bound");
		}
		} else if (service == RIL.NETWORK_SERVICE) {
		if (mNetworkBinder == null) {
		mNetworkServiceConnection = new MockModemConnection(RIL.NETWORK_SERVICE);

		boolean status =
		bindModuleToMockModemService(
		mPhoneId, BIND_IRADIONETWORK, mNetworkServiceConnection);
		if (!status) {
		Rlog.d(TAG, "IRadio Network bind fail");
		mNetworkServiceConnection = null;
		}
		} else {
		Rlog.d(TAG, "IRadio Network is bound");
		}
		} else if (service == RIL.VOICE_SERVICE) {
		if (mVoiceBinder == null) {
		mVoiceServiceConnection = new MockModemConnection(RIL.VOICE_SERVICE);

		boolean status =
		bindModuleToMockModemService(
		mPhoneId, BIND_IRADIOVOICE, mVoiceServiceConnection);
		if (!status) {
		Rlog.d(TAG, "IRadio Voice bind fail");
		mVoiceServiceConnection = null;
		}
		} else {
		Rlog.d(TAG, "IRadio Voice is bound");
		}
		}
		}

		/** unbindMockModemService */
		public void unbindMockModemService(int service) {

		if (service == RADIOCONFIG_SERVICE) {
		if (mConfigServiceConnection != null) {
		mContext.unbindService(mConfigServiceConnection);
		mConfigServiceConnection = null;
		mConfigBinder = null;
		Rlog.d(TAG, "unbind IRadio Config");
		}
		} else if (service == RIL.MODEM_SERVICE) {
		if (mModemServiceConnection != null) {
		mContext.unbindService(mModemServiceConnection);
		mModemServiceConnection = null;
		mModemBinder = null;
		Rlog.d(TAG, "unbind IRadio Modem");
		}
		} else if (service == RIL.SIM_SERVICE) {
		if (mSimServiceConnection != null) {
		mContext.unbindService(mSimServiceConnection);
		mSimServiceConnection = null;
		mSimBinder = null;
		Rlog.d(TAG, "unbind IRadio Sim");
		}
		} else if (service == RIL.MESSAGING_SERVICE) {
		if (mMessagingServiceConnection != null) {
		mContext.unbindService(mMessagingServiceConnection);
		mMessagingServiceConnection = null;
		mMessagingBinder = null;
		Rlog.d(TAG, "unbind IRadio Messaging");
		}
		} else if (service == RIL.DATA_SERVICE) {
		if (mDataServiceConnection != null) {
		mContext.unbindService(mDataServiceConnection);
		mDataServiceConnection = null;
		mDataBinder = null;
		Rlog.d(TAG, "unbind IRadio Data");
		}
		} else if (service == RIL.NETWORK_SERVICE) {
		if (mNetworkServiceConnection != null) {
		mContext.unbindService(mNetworkServiceConnection);
		mNetworkServiceConnection = null;
		mNetworkBinder = null;
		Rlog.d(TAG, "unbind IRadio Network");
		}
		} else if (service == RIL.VOICE_SERVICE) {
		if (mVoiceServiceConnection != null) {
		mContext.unbindService(mVoiceServiceConnection);
		mVoiceServiceConnection = null;
		mVoiceBinder = null;
		Rlog.d(TAG, "unbind IRadio Voice");
		}
		}
		}

		public String getServiceName() {
		return mServiceName;
		}

		private String getModuleName(int service) {
		switch (service) {
		case RIL.MODEM_SERVICE:
		return "modem";
		case RIL.SIM_SERVICE:
		return "sim";
		case RIL.MESSAGING_SERVICE:
		return "messaging";
		case RIL.DATA_SERVICE:
		return "data";
		case RIL.NETWORK_SERVICE:
		return "network";
		case RIL.VOICE_SERVICE:
		return "voice";
		case RADIOCONFIG_SERVICE:
		return "config";
		default:
		return "none";
		}
		}
		}

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

+111 −31

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		private final SparseArray<AtomicLong> mServiceCookies = new SparseArray<>();
		private final RadioProxyDeathRecipient mRadioProxyDeathRecipient;
		final RilHandler mRilHandler;
		private MockModem mMockModem;

		// Thread-safe HashMap to map from RIL_REQUEST_XXX constant to HalVersion.
		// This is for Radio HAL Fallback Compatibility feature. When a RIL request
		@@ -463,27 +464,87 @@ public class RIL extends BaseCommands implements CommandsInterface {
		* @param serviceName the service name we want to bind to
		*/
		public boolean setModemService(String serviceName) {
		boolean serviceBound = true;

		if (serviceName != null) {
		riljLoge("Overriding connected service to MockModemService");
		// TODO: binding to mockmodem service for testing only
		riljLog("Binding to MockModemService");
		mMockModem = null;

		mMockModem = new MockModem(mContext, serviceName, mPhoneId);
		if (mMockModem == null) {
		riljLoge("MockModem create fail.");
		return false;
		}

		// Disable HIDL service
		if (mRadioProxy != null) {
		riljLog("Disable HIDL service");
		mDisabledRadioServices.get(RADIO_SERVICE).add(mPhoneId);
		}

		mMockModem.bindAllMockModemService();

		for (int service = MIN_SERVICE_IDX; service <= MAX_SERVICE_IDX; service++) {
		if (service == RADIO_SERVICE) continue;

		int retryCount = 0;
		IBinder binder;
		do {
		binder = mMockModem.getServiceBinder(service);

		retryCount++;
		if (binder == null) {
		riljLog("Retry(" + retryCount + ") Service " + serviceToString(service));
		try {
		Thread.sleep(MockModem.BINDER_RETRY_MILLIS);
		} catch (InterruptedException e) {
		}
		}
		} while ((binder == null) && (retryCount < MockModem.BINDER_MAX_RETRY));

		if (binder == null) {
		riljLoge("Service " + serviceToString(service) + " bind fail");
		serviceBound = false;
		break;
		}
		}

		if (serviceBound) {
		for (int service = MIN_SERVICE_IDX; service <= MAX_SERVICE_IDX; service++) {
		resetProxyAndRequestList(service);
		}
		} else {
		// TODO: unbinding mockmodem service
		}
		return true;
		}

		if ((serviceName == null) \|\| (!serviceBound)) {
		if (serviceBound) riljLog("Unbinding to MockModemService");

		if (mDisabledRadioServices.get(RADIO_SERVICE).contains(mPhoneId)) {
		mDisabledRadioServices.get(RADIO_SERVICE).clear();
		}

		if (mMockModem != null) {
		for (int service = MIN_SERVICE_IDX; service <= MAX_SERVICE_IDX; service++) {
		mMockModem.unbindMockModemService(service);
		resetProxyAndRequestList(service);
		}
		mMockModem = null;
		}
		}

		return serviceBound;
		}

		/**
		* Get current bound service in Radio Module
		*/
		public String getModemService() {
		//TODO: return the bound service based on connected proxy
		if (mMockModem != null) {
		return mMockModem.getServiceName();
		} else {
		return "default";
		}
		}

		/** Set a radio HAL fallback compatibility override. */
		@VisibleForTesting
		@@ -674,9 +735,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		IBinder binder;
		switch (service) {
		case DATA_SERVICE:
		if (mMockModem == null) {
		binder = ServiceManager.waitForDeclaredService(
		android.hardware.radio.data.IRadioData.DESCRIPTOR + "/"
		+ HIDL_SERVICE_NAME[mPhoneId]);
		} else {
		binder = mMockModem.getServiceBinder(DATA_SERVICE);
		}
		if (binder != null) {
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		((RadioDataProxy) serviceProxy).setAidl(mRadioVersion,
		@@ -685,10 +750,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		break;
		case MESSAGING_SERVICE:
		if (mMockModem == null) {
		binder = ServiceManager.waitForDeclaredService(
		android.hardware.radio.messaging.IRadioMessaging.DESCRIPTOR + "/"
		+ HIDL_SERVICE_NAME[mPhoneId]);
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		android.hardware.radio.messaging.IRadioMessaging.DESCRIPTOR
		+ "/" + HIDL_SERVICE_NAME[mPhoneId]);
		} else {
		binder = mMockModem.getServiceBinder(MESSAGING_SERVICE);
		}
		if (binder != null) {
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		((RadioMessagingProxy) serviceProxy).setAidl(mRadioVersion,
		@@ -697,10 +765,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		break;
		case MODEM_SERVICE:
		if (mMockModem == null) {
		binder = ServiceManager.waitForDeclaredService(
		android.hardware.radio.modem.IRadioModem.DESCRIPTOR + "/"
		+ HIDL_SERVICE_NAME[mPhoneId]);
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		} else {
		binder = mMockModem.getServiceBinder(MODEM_SERVICE);
		}
		if (binder != null) {
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		((RadioModemProxy) serviceProxy).setAidl(mRadioVersion,
		@@ -709,10 +780,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		break;
		case NETWORK_SERVICE:
		if (mMockModem == null) {
		binder = ServiceManager.waitForDeclaredService(
		android.hardware.radio.network.IRadioNetwork.DESCRIPTOR + "/"
		+ HIDL_SERVICE_NAME[mPhoneId]);
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		} else {
		binder = mMockModem.getServiceBinder(NETWORK_SERVICE);
		}
		if (binder != null) {
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		((RadioNetworkProxy) serviceProxy).setAidl(mRadioVersion,
		@@ -721,10 +795,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		break;
		case SIM_SERVICE:
		if (mMockModem == null) {
		binder = ServiceManager.waitForDeclaredService(
		android.hardware.radio.sim.IRadioSim.DESCRIPTOR + "/"
		+ HIDL_SERVICE_NAME[mPhoneId]);
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		} else {
		binder = mMockModem.getServiceBinder(SIM_SERVICE);
		}
		if (binder != null) {
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		((RadioSimProxy) serviceProxy).setAidl(mRadioVersion,
		@@ -733,10 +810,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		break;
		case VOICE_SERVICE:
		if (mMockModem == null) {
		binder = ServiceManager.waitForDeclaredService(
		android.hardware.radio.voice.IRadioVoice.DESCRIPTOR + "/"
		+ HIDL_SERVICE_NAME[mPhoneId]);
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		} else {
		binder = mMockModem.getServiceBinder(VOICE_SERVICE);
		}
		if (binder != null) {
		mRadioVersion = RADIO_HAL_VERSION_2_0;
		((RadioVoiceProxy) serviceProxy).setAidl(mRadioVersion,

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

+57 −3

File changed.

Preview size limit exceeded, changes collapsed.