Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev am: c4c7c19b67 (97667705) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/TelephonyRegistry.java

+0 −30

Original line number	Diff line number	Diff line
		@@ -1426,31 +1426,6 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		}

		public void notifyOemHookRawEventForSubscriber(int subId, byte[] rawData) {
		if (!checkNotifyPermission("notifyOemHookRawEventForSubscriber")) {
		return;
		}

		synchronized (mRecords) {
		for (Record r : mRecords) {
		if (VDBG) {
		log("notifyOemHookRawEventForSubscriber: r=" + r + " subId=" + subId);
		}
		if ((r.matchPhoneStateListenerEvent(
		PhoneStateListener.LISTEN_OEM_HOOK_RAW_EVENT)) &&
		((r.subId == subId) \|\|
		(r.subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID))) {
		try {
		r.callback.onOemHookRawEvent(rawData);
		} catch (RemoteException ex) {
		mRemoveList.add(r.binder);
		}
		}
		}
		handleRemoveListLocked();
		}
		}

		@Override
		public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
		final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
		@@ -1718,11 +1693,6 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		android.Manifest.permission.READ_PRECISE_PHONE_STATE, null);
		}

		if ((events & PhoneStateListener.LISTEN_OEM_HOOK_RAW_EVENT) != 0) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);
		}

		return true;
		}

telephony/java/android/telephony/PhoneStateListener.java

+0 −27

Original line number	Diff line number	Diff line
		@@ -204,16 +204,6 @@ public class PhoneStateListener {
		*/
		public static final int LISTEN_VOLTE_STATE = 0x00004000;

		/**
		* Listen for OEM hook raw event
		*
		* @see #onOemHookRawEvent
		* @hide
		* @deprecated OEM needs a vendor-extension hal and their apps should use that instead
		*/
		@Deprecated
		public static final int LISTEN_OEM_HOOK_RAW_EVENT = 0x00008000;

		/**
		* Listen for carrier network changes indicated by a carrier app.
		*
		@@ -378,9 +368,6 @@ public class PhoneStateListener {
		case LISTEN_USER_MOBILE_DATA_STATE:
		PhoneStateListener.this.onUserMobileDataStateChanged((boolean)msg.obj);
		break;
		case LISTEN_OEM_HOOK_RAW_EVENT:
		PhoneStateListener.this.onOemHookRawEvent((byte[])msg.obj);
		break;
		case LISTEN_CARRIER_NETWORK_CHANGE:
		PhoneStateListener.this.onCarrierNetworkChange((boolean)msg.obj);
		break;
		@@ -600,16 +587,6 @@ public class PhoneStateListener {
		// default implementation empty
		}

		/**
		* Callback invoked when OEM hook raw event is received. Requires
		* the READ_PRIVILEGED_PHONE_STATE permission.
		* @param rawData is the byte array of the OEM hook raw data.
		* @hide
		*/
		public void onOemHookRawEvent(byte[] rawData) {
		// default implementation empty
		}

		/**
		* Callback invoked when telephony has received notice from a carrier
		* app that a network action that could result in connectivity loss
		@@ -726,10 +703,6 @@ public class PhoneStateListener {
		send(LISTEN_USER_MOBILE_DATA_STATE, 0, 0, enabled);
		}

		public void onOemHookRawEvent(byte[] rawData) {
		send(LISTEN_OEM_HOOK_RAW_EVENT, 0, 0, rawData);
		}

		public void onCarrierNetworkChange(boolean active) {
		send(LISTEN_CARRIER_NETWORK_CHANGE, 0, 0, active);
		}

telephony/java/android/telephony/TelephonyManager.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -6506,29 +6506,6 @@ public class TelephonyManager {
		return retVal;
		}

		/**
		* Returns the result and response from RIL for oem request
		*
		* @param oemReq the data is sent to ril.
		* @param oemResp the respose data from RIL.
		* @return negative value request was not handled or get error
		* 0 request was handled succesfully, but no response data
		* positive value success, data length of response
		* @hide
		* @deprecated OEM needs a vendor-extension hal and their apps should use that instead
		*/
		@Deprecated
		public int invokeOemRilRequestRaw(byte[] oemReq, byte[] oemResp) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		return telephony.invokeOemRilRequestRaw(oemReq, oemResp);
		} catch (RemoteException ex) {
		} catch (NullPointerException ex) {
		}
		return -1;
		}

		/** @hide */
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ oneway interface IPhoneStateListener {
		void onVoLteServiceStateChanged(in VoLteServiceState lteState);
		void onVoiceActivationStateChanged(int activationState);
		void onDataActivationStateChanged(int activationState);
		void onOemHookRawEvent(in byte[] rawData);
		void onCarrierNetworkChange(in boolean active);
		void onUserMobileDataStateChanged(in boolean enabled);
		}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+0 −11

Original line number	Diff line number	Diff line
		@@ -1064,17 +1064,6 @@ interface ITelephony {
		in List<String> gsmNonRoamingList, in List<String> cdmaRoamingList,
		in List<String> cdmaNonRoamingList);

		/**
		* Returns the result and response from RIL for oem request
		*
		* @param oemReq the data is sent to ril.
		* @param oemResp the respose data from RIL.
		* @return negative value request was not handled or get error
		* 0 request was handled succesfully, but no response data
		* positive value success, data length of response
		*/
		int invokeOemRilRequestRaw(in byte[] oemReq, out byte[] oemResp);

		/**
		* Check if any mobile Radios need to be shutdown.
		*