[Telephony] Remove IOem in Telephony (9bdb7a49) · Commits · e / os / android_frameworks_opt_telephony

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

deleted100644 → 0

+0 −53

Original line number	Diff line number	Diff line
		/**
		* Copyright (C) 2017 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.deprecated.V1_0.IOemHookIndication;
		import android.os.AsyncResult;

		import java.util.ArrayList;

		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_OEM_HOOK_RAW;

		/**
		* Class containing oem hook indication callbacks
		*/
		public class OemHookIndication extends IOemHookIndication.Stub {
		RIL mRil;

		public OemHookIndication(RIL ril) {
		mRil = ril;
		}

		/**
		* @param indicationType RadioIndicationType
		* @param data Data sent by oem
		*/
		public void oemHookRaw(int indicationType, ArrayList<Byte> data) {
		mRil.processIndication(indicationType);

		byte[] response = RIL.arrayListToPrimitiveArray(data);
		if (RIL.RILJ_LOGD) {
		mRil.unsljLogvRet(RIL_UNSOL_OEM_HOOK_RAW,
		com.android.internal.telephony.uicc.IccUtils.bytesToHexString(response));
		}

		if (mRil.mUnsolOemHookRawRegistrant != null) {
		mRil.mUnsolOemHookRawRegistrant.notifyRegistrant(new AsyncResult(null, response, null));
		}
		}
		}

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

deleted100644 → 0

+0 −59

Original line number	Diff line number	Diff line
		/**
		* Copyright (C) 2017 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.deprecated.V1_0.IOemHookResponse;
		import android.hardware.radio.V1_0.RadioError;
		import android.hardware.radio.V1_0.RadioResponseInfo;

		import java.util.ArrayList;

		/**
		* Class containing oem hook response callbacks
		*/
		public class OemHookResponse extends IOemHookResponse.Stub {
		RIL mRil;

		public OemHookResponse(RIL ril) {
		mRil = ril;
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param data Data returned by oem
		*/
		public void sendRequestRawResponse(RadioResponseInfo responseInfo, ArrayList<Byte> data) {
		RILRequest rr = mRil.processResponse(responseInfo);

		if (rr != null) {
		byte[] ret = null;
		if (responseInfo.error == RadioError.NONE) {
		ret = RIL.arrayListToPrimitiveArray(data);
		RadioResponse.sendMessageResponse(rr.mResult, ret);
		}
		mRil.processResponseDone(rr, responseInfo, ret);
		}
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param data Data returned by oem
		*/
		public void sendRequestStringsResponse(RadioResponseInfo responseInfo, ArrayList<String> data) {
		RadioResponse.responseStringArrayList(mRil, responseInfo, data);
		}
		}

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

+2 −114

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import android.hardware.radio.V1_6.OptionalDnn;
		import android.hardware.radio.V1_6.OptionalOsAppId;
		import android.hardware.radio.V1_6.OptionalSliceInfo;
		import android.hardware.radio.V1_6.OptionalTrafficDescriptor;
		import android.hardware.radio.deprecated.V1_0.IOemHook;
		import android.net.InetAddresses;
		import android.net.KeepalivePacketData;
		import android.net.LinkAddress;
		@@ -262,12 +261,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		*/
		Set<Integer> mDisabledRadioServices = new HashSet();

		/**
		* A set that records if oem hook service is disabled in hal for
		* a specific phone id slot to avoid further getService request.
		*/
		Set<Integer> mDisabledOemHookServices = new HashSet();

		/* default work source which will blame phone process */
		private WorkSource mRILDefaultWorkSource;

		@@ -283,9 +276,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		RadioResponse mRadioResponse;
		RadioIndication mRadioIndication;
		volatile IRadio mRadioProxy = null;
		OemHookResponse mOemHookResponse;
		OemHookIndication mOemHookIndication;
		volatile IOemHook mOemHookProxy = null;
		final AtomicLong mRadioProxyCookie = new AtomicLong(0);
		final RadioProxyDeathRecipient mRadioProxyDeathRecipient;
		final RilHandler mRilHandler;
		@@ -448,7 +438,6 @@ public class RIL extends BaseCommands implements CommandsInterface {

		private synchronized void resetProxyAndRequestList() {
		mRadioProxy = null;
		mOemHookProxy = null;

		// increment the cookie so that death notification can be ignored
		mRadioProxyCookie.incrementAndGet();
		@@ -460,7 +449,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		clearRequestList(RADIO_NOT_AVAILABLE, false);

		getRadioProxy(null);
		getOemHookProxy(null);
		}

		/** Set a radio HAL fallback compatibility override. */
		@@ -599,65 +587,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
		if (active) {
		// Try to connect to RIL services and set response functions.
		getRadioProxy(null);
		getOemHookProxy(null);
		} else {
		resetProxyAndRequestList();
		}
		}

		/** Returns an {@link IOemHook} instance or null if the service is not available. */
		@VisibleForTesting
		public synchronized IOemHook getOemHookProxy(Message result) {
		if (!SubscriptionManager.isValidPhoneId((mPhoneId))) return null;
		if (!mIsCellularSupported) {
		if (RILJ_LOGV) riljLog("getOemHookProxy: Not calling getService(): wifi-only");
		if (result != null) {
		AsyncResult.forMessage(result, null,
		CommandException.fromRilErrno(RADIO_NOT_AVAILABLE));
		result.sendToTarget();
		}
		return null;
		}

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

		try {
		if (mDisabledOemHookServices.contains(mPhoneId)) {
		riljLoge("getOemHookProxy: mOemHookProxy for " + HIDL_SERVICE_NAME[mPhoneId]
		+ " is disabled");
		} else {
		mOemHookProxy = IOemHook.getService(HIDL_SERVICE_NAME[mPhoneId], true);
		if (mOemHookProxy != null) {
		// not calling linkToDeath() as ril service runs in the same process and death
		// notification for that should be sufficient
		mOemHookProxy.setResponseFunctions(mOemHookResponse, mOemHookIndication);
		} else {
		mDisabledOemHookServices.add(mPhoneId);
		riljLoge("getOemHookProxy: mOemHookProxy for " + HIDL_SERVICE_NAME[mPhoneId]
		+ " is disabled");
		}
		}
		} catch (NoSuchElementException e) {
		mOemHookProxy = null;
		riljLoge("IOemHook service is not on the device HAL: " + e);
		} catch (RemoteException e) {
		mOemHookProxy = null;
		riljLoge("OemHookProxy getService/setResponseFunctions: " + e);
		}

		if (mOemHookProxy == null) {
		if (result != null) {
		AsyncResult.forMessage(result, null,
		CommandException.fromRilErrno(RADIO_NOT_AVAILABLE));
		result.sendToTarget();
		}
		}

		return mOemHookProxy;
		}

		//***** Constructors

		@UnsupportedAppUsage
		@@ -689,8 +623,6 @@ public class RIL extends BaseCommands implements CommandsInterface {

		mRadioResponse = new RadioResponse(this);
		mRadioIndication = new RadioIndication(this);
		mOemHookResponse = new OemHookResponse(this);
		mOemHookIndication = new OemHookIndication(this);
		mRilHandler = new RilHandler();
		mRadioProxyDeathRecipient = new RadioProxyDeathRecipient();

		@@ -714,7 +646,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		// set radio callback; needed to set RadioIndication callback (should be done after
		// wakelock stuff is initialized above as callbacks are received on separate binder threads)
		getRadioProxy(null);
		getOemHookProxy(null);

		if (RILJ_LOGD) {
		riljLog("Radio HAL version: " + mRadioVersion);
		@@ -3069,58 +3000,15 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		}

		// TODO(b/171260715) Remove when HAL definition is removed
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@Override
		public void invokeOemRilRequestRaw(byte[] data, Message response) {
		IOemHook oemHookProxy = getOemHookProxy(response);
		if (oemHookProxy != null) {
		RILRequest rr = obtainRequest(RIL_REQUEST_OEM_HOOK_RAW, response,
		mRILDefaultWorkSource);

		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		+ "[" + IccUtils.bytesToHexString(data) + "]");
		}

		try {
		oemHookProxy.sendRequestRaw(rr.mSerial, primitiveArrayToArrayList(data));
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "invokeOemRilRequestRaw", e);
		}
		} else {
		// OEM Hook service is disabled for P and later devices.
		// Deprecated OEM Hook APIs will perform no-op before being removed.
		if (RILJ_LOGD) riljLog("Radio Oem Hook Service is disabled for P and later devices. ");
		}
		}

		// TODO(b/171260715) Remove when HAL definition is removed
		@Override
		public void invokeOemRilRequestStrings(String[] strings, Message result) {
		IOemHook oemHookProxy = getOemHookProxy(result);
		if (oemHookProxy != null) {
		RILRequest rr = obtainRequest(RIL_REQUEST_OEM_HOOK_STRINGS, result,
		mRILDefaultWorkSource);

		String logStr = "";
		for (int i = 0; i < strings.length; i++) {
		logStr = logStr + strings[i] + " ";
		}
		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " strings = "
		+ logStr);
		}

		try {
		oemHookProxy.sendRequestStrings(rr.mSerial,
		new ArrayList<String>(Arrays.asList(strings)));
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "invokeOemRilRequestStrings", e);
		}
		} else {
		// OEM Hook service is disabled for P and later devices.
		// Deprecated OEM Hook APIs will perform no-op before being removed.
		if (RILJ_LOGD) riljLog("Radio Oem Hook Service is disabled for P and later devices. ");
		}
		}

		@Override

tests/telephonytests/src/com/android/internal/telephony/RILTest.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -116,7 +116,6 @@ import android.hardware.radio.V1_0.RadioResponseType;
		import android.hardware.radio.V1_0.RadioTechnologyFamily;
		import android.hardware.radio.V1_0.SmsWriteArgs;
		import android.hardware.radio.V1_6.IRadio;
		import android.hardware.radio.deprecated.V1_0.IOemHook;
		import android.net.ConnectivityManager;
		import android.net.InetAddresses;
		import android.net.LinkAddress;
		@@ -203,8 +202,6 @@ public class RILTest extends TelephonyTest {
		private TelephonyManager mTelephonyManager;
		@Mock
		private IRadio mRadioProxy;
		@Mock
		private IOemHook mOemHookProxy;

		private HalVersion mRadioVersionV10 = new HalVersion(1, 0);
		private HalVersion mRadioVersionV11 = new HalVersion(1, 1);
		@@ -316,7 +313,6 @@ public class RILTest extends TelephonyTest {
		Phone.PREFERRED_CDMA_SUBSCRIPTION, 0);
		mRILUnderTest = spy(mRILInstance);
		doReturn(mRadioProxy).when(mRILUnderTest).getRadioProxy(any());
		doReturn(mOemHookProxy).when(mRILUnderTest).getOemHookProxy(any());

		try {
		replaceInstance(RIL.class, "mRadioVersion", mRILUnderTest, mRadioVersionV10);
		@@ -1383,22 +1379,6 @@ public class RILTest extends TelephonyTest {
		mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_GET_BARRING_INFO);
		}

		@Test
		public void testInvokeOemRilRequestStrings() throws Exception {
		String[] strings = new String[]{"a", "b", "c"};
		mRILUnderTest.invokeOemRilRequestStrings(strings, obtainMessage());
		verify(mOemHookProxy).sendRequestStrings(
		mSerialNumberCaptor.capture(), eq(new ArrayList<>(Arrays.asList(strings))));
		}

		@Test
		public void testInvokeOemRilRequestRaw() throws Exception {
		byte[] data = new byte[]{1, 2, 3};
		mRILUnderTest.invokeOemRilRequestRaw(data, obtainMessage());
		verify(mOemHookProxy).sendRequestRaw(
		mSerialNumberCaptor.capture(), eq(mRILUnderTest.primitiveArrayToArrayList(data)));
		}

		private Message obtainMessage() {
		return mRILUnderTest.getRilHandler().obtainMessage();
		}