Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 066e8652 authored by Shuo Qian's avatar Shuo Qian
Browse files

Restore the OEM hook implementation and usage 

The current plan is to keep the OEM hook implementation in the 
framework, this is for legacy device and old device upgrading 
(per b/78098059).

For P launching device, the OEM hook service is removed in hal, 
so the OEM hook api in framework should return something dummy, and 
prevent infinite loop to get service, but these parts should be done
in seperate CLs after this restore CL is merged.

This reverts commit cbfa614f.

Bug: 34344851
Test: pass Treehugger tests; pass cuttlefish test RilE2eTests
Change-Id: I1f2117331a7f846b192c5f956f3841d58cb8154b
parent cbfa614f

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

+30 −0
Original line number Diff line number Diff line
@@ -1426,6 +1426,31 @@ 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, "  ");
@@ -1693,6 +1718,11 @@ 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

+27 −0
Original line number Diff line number Diff line
@@ -203,6 +203,16 @@ 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.

     *
@@ -367,6 +377,9 @@ 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;
@@ -582,6 +595,16 @@ 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
@@ -698,6 +721,10 @@ 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

+23 −0
Original line number Diff line number Diff line
@@ -6445,6 +6445,29 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 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

+11 −0
Original line number Diff line number Diff line
@@ -1070,6 +1070,17 @@ 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.

     *