Revert "Client side implementation for IRadioConfig hal." (d1b957a4) · Commits · e / os / android_frameworks_opt_telephony

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

deleted100644 → 0

+0 −340

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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 static com.android.internal.telephony.RILConstants.RADIO_NOT_AVAILABLE;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_GET_SLOT_STATUS;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_SET_LOGICAL_TO_PHYSICAL_SLOT_MAPPING;

		import android.content.Context;
		import android.hardware.radio.V1_0.RadioResponseInfo;
		import android.hardware.radio.V1_0.RadioResponseType;
		import android.hardware.radio.config.V1_0.IRadioConfig;
		import android.hardware.radio.config.V1_0.SimSlotStatus;
		import android.net.ConnectivityManager;
		import android.os.AsyncResult;
		import android.os.Handler;
		import android.os.HwBinder;
		import android.os.Message;
		import android.os.Registrant;
		import android.os.RemoteException;
		import android.os.WorkSource;
		import android.telephony.Rlog;
		import android.util.SparseArray;

		import com.android.internal.telephony.uicc.IccSlotStatus;

		import java.util.ArrayList;
		import java.util.concurrent.atomic.AtomicLong;

		/**
		* This class provides wrapper APIs for IRadioConfig interface.
		*/
		public class RadioConfig extends Handler {
		private static final String TAG = "RadioConfig";
		private static final boolean DBG = true;
		private static final boolean VDBG = false; //STOPSHIP if true

		private static final String RADIO_CONFIG_SERVICE_NAME = "radioconfig";
		private static final int EVENT_SERVICE_DEAD = 1;

		private final boolean mIsMobileNetworkSupported;
		private volatile IRadioConfig mRadioConfigProxy = null;
		private final ServiceDeathRecipient mServiceDeathRecipient;
		private final AtomicLong mRadioConfigProxyCookie = new AtomicLong(0);
		private final RadioConfigResponse mRadioConfigResponse;
		private final RadioConfigIndication mRadioConfigIndication;
		private final SparseArray<RILRequest> mRequestList = new SparseArray<RILRequest>();
		/* default work source which will blame phone process */
		private final WorkSource mDefaultWorkSource;
		private static RadioConfig sRadioConfig;

		protected Registrant mSimSlotStatusRegistrant;

		final class ServiceDeathRecipient implements HwBinder.DeathRecipient {
		@Override
		public void serviceDied(long cookie) {
		// Deal with service going away
		logd("serviceDied");
		sendMessage(obtainMessage(EVENT_SERVICE_DEAD, cookie));
		}
		}

		private RadioConfig(Context context) {
		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(
		Context.CONNECTIVITY_SERVICE);
		mIsMobileNetworkSupported = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);

		mRadioConfigResponse = new RadioConfigResponse(this);
		mRadioConfigIndication = new RadioConfigIndication(this);
		mServiceDeathRecipient = new ServiceDeathRecipient();

		mDefaultWorkSource = new WorkSource(context.getApplicationInfo().uid,
		context.getPackageName());
		}

		/**
		* Returns the singleton static instance of RadioConfig
		*/
		public static RadioConfig getInstance(Context context) {
		if (sRadioConfig == null) {
		sRadioConfig = new RadioConfig(context);
		}
		return sRadioConfig;
		}

		@Override
		public void handleMessage(Message message) {
		switch (message.what) {
		case EVENT_SERVICE_DEAD:
		logd("handleMessage: EVENT_SERVICE_DEAD cookie = " + message.obj
		+ " mRadioConfigProxyCookie = " + mRadioConfigProxyCookie.get());
		if ((long) message.obj == mRadioConfigProxyCookie.get()) {
		resetProxyAndRequestList("EVENT_SERVICE_DEAD", null);
		}
		break;
		}
		}

		/**
		* Release each request in mRequestList then clear the list
		* @param error is the RIL_Errno sent back
		* @param loggable true means to print all requests in mRequestList
		*/
		private void clearRequestList(int error, boolean loggable) {
		RILRequest rr;
		synchronized (mRequestList) {
		int count = mRequestList.size();
		if (DBG && loggable) {
		logd("clearRequestList: mRequestList=" + count);
		}

		for (int i = 0; i < count; i++) {
		rr = mRequestList.valueAt(i);
		if (DBG && loggable) {
		logd(i + ": [" + rr.mSerial + "] " + requestToString(rr.mRequest));
		}
		rr.onError(error, null);
		rr.release();
		}
		mRequestList.clear();
		}
		}

		private void resetProxyAndRequestList(String caller, Exception e) {
		loge(caller + ": " + e);
		mRadioConfigProxy = null;

		// increment the cookie so that death notification can be ignored
		mRadioConfigProxyCookie.incrementAndGet();

		RILRequest.resetSerial();
		// Clear request list on close
		clearRequestList(RADIO_NOT_AVAILABLE, false);

		getRadioConfigProxy(null);
		}

		/** Returns a {@link IRadioConfig} instance or null if the service is not available. */
		public IRadioConfig getRadioConfigProxy(Message result) {
		if (!mIsMobileNetworkSupported) {
		if (VDBG) logd("getRadioConfigProxy: Not calling getService(): wifi-only");
		if (result != null) {
		AsyncResult.forMessage(result, null,
		CommandException.fromRilErrno(RADIO_NOT_AVAILABLE));
		result.sendToTarget();
		}
		return null;
		}

		if (mRadioConfigProxy != null) {
		return mRadioConfigProxy;
		}

		try {
		mRadioConfigProxy = IRadioConfig.getService(RADIO_CONFIG_SERVICE_NAME);
		if (mRadioConfigProxy != null) {
		mRadioConfigProxy.linkToDeath(mServiceDeathRecipient,
		mRadioConfigProxyCookie.incrementAndGet());
		mRadioConfigProxy.setResponseFunctions(mRadioConfigResponse,
		mRadioConfigIndication);
		} else {
		loge("getRadioConfigProxy: mRadioConfigProxy == null");
		}
		} catch (RemoteException \| RuntimeException e) {
		mRadioConfigProxy = null;
		loge("getRadioConfigProxy: RadioProxy getService/setResponseFunctions: " + e);
		}

		if (mRadioConfigProxy == null) {
		// getService() is a blocking call, so this should never happen
		loge("getRadioConfigProxy: mRadioConfigProxy == null");
		if (result != null) {
		AsyncResult.forMessage(result, null,
		CommandException.fromRilErrno(RADIO_NOT_AVAILABLE));
		result.sendToTarget();
		}
		}

		return mRadioConfigProxy;
		}

		private RILRequest obtainRequest(int request, Message result, WorkSource workSource) {
		RILRequest rr = RILRequest.obtain(request, result, workSource);
		synchronized (mRequestList) {
		mRequestList.append(rr.mSerial, rr);
		}
		return rr;
		}

		private RILRequest findAndRemoveRequestFromList(int serial) {
		RILRequest rr;
		synchronized (mRequestList) {
		rr = mRequestList.get(serial);
		if (rr != null) {
		mRequestList.remove(serial);
		}
		}

		return rr;
		}

		/**
		* This is a helper function to be called when a RadioConfigResponse callback is called.
		* It finds and returns RILRequest corresponding to the response if one is found.
		* @param responseInfo RadioResponseInfo received in response callback
		* @return RILRequest corresponding to the response
		*/
		public RILRequest processResponse(RadioResponseInfo responseInfo) {
		int serial = responseInfo.serial;
		int error = responseInfo.error;
		int type = responseInfo.type;

		if (type != RadioResponseType.SOLICITED) {
		loge("processResponse: Unexpected response type " + type);
		}

		RILRequest rr = findAndRemoveRequestFromList(serial);
		if (rr == null) {
		loge("processResponse: Unexpected response! serial: " + serial + " error: " + error);
		return null;
		}

		return rr;
		}

		/**
		* Wrapper function for IRadioConfig.getSimSlotsStatus().
		*/
		public void getSimSlotsStatus(Message result) {
		IRadioConfig radioConfigProxy = getRadioConfigProxy(result);
		if (radioConfigProxy != null) {
		RILRequest rr = obtainRequest(RIL_REQUEST_GET_SLOT_STATUS, result, mDefaultWorkSource);

		if (DBG) {
		logd(rr.serialString() + "> " + requestToString(rr.mRequest));
		}

		try {
		radioConfigProxy.getSimSlotsStatus(rr.mSerial);
		} catch (RemoteException \| RuntimeException e) {
		resetProxyAndRequestList("getSimSlotsStatus", e);
		}
		}
		}

		/**
		* Wrapper function for IRadioConfig.getSimSlotsStatus().
		*/
		public void setSimSlotsMapping(int[] physicalSlots, Message result) {
		IRadioConfig radioConfigProxy = getRadioConfigProxy(result);
		if (radioConfigProxy != null) {
		RILRequest rr = obtainRequest(RIL_REQUEST_SET_LOGICAL_TO_PHYSICAL_SLOT_MAPPING, result,
		mDefaultWorkSource);

		if (DBG) {
		logd(rr.serialString() + "> " + requestToString(rr.mRequest));
		}

		try {
		radioConfigProxy.setSimSlotsMapping(rr.mSerial,
		primitiveArrayToArrayList(physicalSlots));
		} catch (RemoteException \| RuntimeException e) {
		resetProxyAndRequestList("setSimSlotsMapping", e);
		}
		}
		}

		private static ArrayList<Integer> primitiveArrayToArrayList(int[] arr) {
		ArrayList<Integer> arrayList = new ArrayList<>(arr.length);
		for (int i : arr) {
		arrayList.add(i);
		}
		return arrayList;
		}

		private static String requestToString(int request) {
		switch (request) {
		case RIL_REQUEST_GET_SLOT_STATUS:
		return "GET_SLOT_STATUS";
		case RIL_REQUEST_SET_LOGICAL_TO_PHYSICAL_SLOT_MAPPING:
		return "SET_LOGICAL_TO_PHYSICAL_SLOT_MAPPING";
		default:
		return "<unknown request>";
		}
		}

		/**
		* Register a handler to get SIM slot status changed notifications.
		*/
		public void registerForSimSlotStatusChanged(Handler h, int what, Object obj) {
		mSimSlotStatusRegistrant = new Registrant(h, what, obj);
		}

		/**
		* Unregister corresponding to registerForSimSlotStatusChanged().
		*/
		public void unregisterForSimSlotStatusChanged(Handler h) {
		if (mSimSlotStatusRegistrant != null && mSimSlotStatusRegistrant.getHandler() == h) {
		mSimSlotStatusRegistrant.clear();
		mSimSlotStatusRegistrant = null;
		}
		}

		static ArrayList<IccSlotStatus> convertHalSlotStatus(
		ArrayList<SimSlotStatus> halSlotStatusList) {
		ArrayList<IccSlotStatus> response = new ArrayList<IccSlotStatus>(halSlotStatusList.size());
		for (SimSlotStatus slotStatus : halSlotStatusList) {
		IccSlotStatus iccSlotStatus = new IccSlotStatus();
		iccSlotStatus.setCardState(slotStatus.cardState);
		iccSlotStatus.setSlotState(slotStatus.slotState);
		iccSlotStatus.logicalSlotIndex = slotStatus.logicalSlotId;
		iccSlotStatus.atr = slotStatus.atr;
		iccSlotStatus.iccid = slotStatus.iccid;
		response.add(iccSlotStatus);
		}
		return response;
		}

		private static void logd(String log) {
		Rlog.d(TAG, log);
		}

		private static void loge(String log) {
		Rlog.e(TAG, log);
		}
		}

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

deleted100644 → 0

+0 −48

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.hardware.radio.config.V1_0.IRadioConfigIndication;
		import android.hardware.radio.config.V1_0.SimSlotStatus;
		import android.os.AsyncResult;

		import com.android.internal.telephony.uicc.IccSlotStatus;

		import java.util.ArrayList;

		/**
		* This class is the implementation of IRadioConfigIndication interface.
		*/
		public class RadioConfigIndication extends IRadioConfigIndication.Stub {
		private final RadioConfig mRadioConfig;

		public RadioConfigIndication(RadioConfig radioConfig) {
		mRadioConfig = radioConfig;
		}

		/**
		* Unsolicited indication for slot status changed
		*/
		public void simSlotsStatusChanged(int indicationType, ArrayList<SimSlotStatus> slotStatus) {
		ArrayList<IccSlotStatus> ret = RadioConfig.convertHalSlotStatus(slotStatus);

		if (mRadioConfig.mSimSlotStatusRegistrant != null) {
		mRadioConfig.mSimSlotStatusRegistrant.notifyRegistrant(
		new AsyncResult(null, ret, null));
		}
		}
		}

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

deleted100644 → 0

+0 −71

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.hardware.radio.V1_0.RadioError;
		import android.hardware.radio.V1_0.RadioResponseInfo;
		import android.hardware.radio.config.V1_0.IRadioConfigResponse;
		import android.hardware.radio.config.V1_0.SimSlotStatus;

		import com.android.internal.telephony.uicc.IccSlotStatus;

		import java.util.ArrayList;

		/**
		* This class is the implementation of IRadioConfigResponse interface.
		*/
		public class RadioConfigResponse extends IRadioConfigResponse.Stub {
		private final RadioConfig mRadioConfig;

		public RadioConfigResponse(RadioConfig radioConfig) {
		mRadioConfig = radioConfig;
		}

		/**
		* Response function for IRadioConfig.getSimSlotsStatus().
		*/
		public void getSimSlotsStatusResponse(RadioResponseInfo responseInfo,
		ArrayList<SimSlotStatus> slotStatus) {
		RILRequest rr = mRadioConfig.processResponse(responseInfo);

		if (rr != null) {
		ArrayList<IccSlotStatus> ret = RadioConfig.convertHalSlotStatus(slotStatus);
		if (responseInfo.error == RadioError.NONE) {
		// send response
		RadioResponse.sendMessageResponse(rr.mResult, ret);
		} else {
		rr.onError(responseInfo.error, ret);
		}
		}
		}

		/**
		* Response function for IRadioConfig.setSimSlotsMapping().
		*/
		public void setSimSlotsMappingResponse(RadioResponseInfo responseInfo) {
		RILRequest rr = mRadioConfig.processResponse(responseInfo);

		if (rr != null) {
		if (responseInfo.error == RadioError.NONE) {
		// send response
		RadioResponse.sendMessageResponse(rr.mResult, null);
		} else {
		rr.onError(responseInfo.error, null);
		}
		}
		}
		}

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

+5 −10

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.text.format.Time;
		import com.android.internal.telephony.CommandException;
		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.RadioConfig;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -116,7 +115,6 @@ public class UiccController extends Handler {
		protected RegistrantList mIccChangedRegistrants = new RegistrantList();

		private UiccStateChangedLauncher mLauncher;
		private RadioConfig mRadioConfig;

		// Logging for dumpsys. Useful in cases when the cards run into errors.
		private static final int MAX_PROACTIVE_COMMANDS_TO_LOG = 20;
		@@ -145,10 +143,12 @@ public class UiccController extends Handler {
		mPhoneIdToSlotId = new int[ci.length];
		Arrays.fill(mPhoneIdToSlotId, INVALID_SLOT_ID);
		if (VDBG) logPhoneIdToSlotIdMapping();
		mRadioConfig = RadioConfig.getInstance(mContext);
		mRadioConfig.registerForSimSlotStatusChanged(this, EVENT_SLOT_STATUS_CHANGED, null);
		for (int i = 0; i < mCis.length; i++) {
		mCis[i].registerForIccStatusChanged(this, EVENT_ICC_STATUS_CHANGED, i);
		// slot status should be the same on all RILs; request it only for phoneId 0
		if (i == 0) {
		mCis[i].registerForIccSlotStatusChanged(this, EVENT_SLOT_STATUS_CHANGED, i);
		}

		// TODO remove this once modem correctly notifies the unsols
		// If the device is unencrypted or has been decrypted or FBE is supported,
		@@ -276,11 +276,6 @@ public class UiccController extends Handler {
		}
		}

		/** Map logicalSlot to physicalSlot, and activate the physicalSlot if it is inactive. */
		public void switchSlots(int[] physicalSlots, Message response) {
		mRadioConfig.setSimSlotsMapping(physicalSlots, response);
		}

		// Easy to use API
		public IccRecords getIccRecords(int phoneId, int family) {
		synchronized (mLock) {
		@@ -353,7 +348,7 @@ public class UiccController extends Handler {
		log("Received EVENT_RADIO_AVAILABLE/EVENT_RADIO_ON for phoneId 0, "
		+ "calling getIccSlotsStatus");
		}
		mRadioConfig.getSimSlotsStatus(obtainMessage(EVENT_GET_SLOT_STATUS_DONE,
		mCis[phoneId].getIccSlotsStatus(obtainMessage(EVENT_GET_SLOT_STATUS_DONE,
		phoneId));
		}
		break;