diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 60d11d7e6f4b9..83fe97697194f 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -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; } diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index c16701ba0f351..0ff29825bfb3d 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/telephony/java/android/telephony/PhoneStateListener.java @@ -203,16 +203,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. * @@ -377,9 +367,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; @@ -595,16 +582,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 @@ -721,10 +698,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); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c850004a54d8c..3880f2f9ab94f 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6479,29 +6479,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) diff --git a/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl b/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl index 0d315e5e563e1..1cfe8c2442bd6 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl @@ -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); } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 73cd498123fdd..7e8b2de4bc2a7 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -1070,17 +1070,6 @@ interface ITelephony { in List gsmNonRoamingList, in List cdmaRoamingList, in List 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. * diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 0127db97963e3..06dc13e53bf7a 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -70,7 +70,6 @@ interface ITelephonyRegistry { void notifyVoLteServiceStateChanged(in VoLteServiceState lteState); void notifySimActivationStateChangedForPhoneId(in int phoneId, in int subId, int activationState, int activationType); - void notifyOemHookRawEventForSubscriber(in int subId, in byte[] rawData); void notifySubscriptionInfoChanged(); void notifyCarrierNetworkChange(in boolean active); void notifyUserMobileDataStateChangedForPhoneId(in int phoneId, in int subId, in boolean state);