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

Commit 83b395ce authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 743 into donut 

* changes:
  Add RIL_UNSOL_OEM_HOOK_RAW.
parents 3500f016 2a34043d

telephony/java/com/android/internal/telephony/BaseCommands.java

+10 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ public abstract class BaseCommands implements CommandsInterface { 
    protected RegistrantList mIccStatusChangedRegistrants = new RegistrantList();

    protected RegistrantList mVoicePrivacyOnRegistrants = new RegistrantList();

    protected RegistrantList mVoicePrivacyOffRegistrants = new RegistrantList();

    protected Registrant mUnsolOemHookRawRegistrant;

    protected Registrant mSMSRegistrant;

    protected Registrant mNITZTimeRegistrant;

    protected Registrant mSignalStrengthRegistrant;
@@ -461,6 +462,14 @@ public abstract class BaseCommands implements CommandsInterface { 
        mRestrictedStateRegistrant.clear();

    }



    public void setOnUnsolOemHookRaw(Handler h, int what, Object obj) {

        mUnsolOemHookRawRegistrant = new Registrant (h, what, obj);

    }



    public void unSetOnUnsolOemHookRaw(Handler h) {

        mUnsolOemHookRawRegistrant.clear();

    }



    //***** Protected Methods

    /**

     * Store new RadioState and send notification based on the changes

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

+23 −22
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.telephony;



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

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -30,30 +31,21 @@ import android.os.Message; 
import android.os.Parcel;

import android.os.PowerManager;

import android.os.PowerManager.WakeLock;

import android.telephony.PhoneNumberUtils;

import android.telephony.NeighboringCellInfo;

import android.telephony.PhoneNumberUtils;

import android.telephony.SmsManager;

import android.telephony.SmsMessage;

import android.util.Log;

import android.util.Config;

import android.util.Log;



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



import com.android.internal.telephony.CallForwardInfo;

import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.gsm.NetworkInfo;

import com.android.internal.telephony.gsm.PDPContextState;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.IccCardApplication;

import com.android.internal.telephony.IccCardStatus;

import com.android.internal.telephony.IccUtils;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.SmsResponse;



import java.io.ByteArrayInputStream;

import java.io.DataInputStream;

import java.io.InputStream;

import java.io.IOException;

import java.io.InputStream;

import java.util.ArrayList;

import java.util.Collections;
@@ -2162,6 +2154,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            case RIL_UNSOL_RESPONSE_CDMA_NEW_SMS:  ret =  responseCdmaSms(p); break;

            case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS:  ret =  responseString(p); break;

            case RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL:  ret =  responseVoid(p); break;

            case RIL_UNSOL_OEM_HOOK_RAW: ret = responseRaw(p); break;

            default:

                throw new RuntimeException("Unrecognized unsol response: " + response);

            //break; (implied)
@@ -2387,6 +2380,13 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                    mIccSmsFullRegistrant.notifyRegistrant();

                }

                break;



            case RIL_UNSOL_OEM_HOOK_RAW:

                if (RILJ_LOGD) unsljLogvRet(response, IccUtils.bytesToHexString((byte[])ret));

                if (mUnsolOemHookRawRegistrant != null) {

                    mUnsolOemHookRawRegistrant.notifyRegistrant(new AsyncResult(null, ret, null));

                }

                break;

        }

    }
@@ -2918,6 +2918,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            case RIL_UNSOL_SIM_REFRESH: return "UNSOL_SIM_REFRESH";

            case RIL_UNSOL_CALL_RING: return "UNSOL_CALL_RING";

            case RIL_UNSOL_RESTRICTED_STATE_CHANGED: return "RIL_UNSOL_RESTRICTED_STATE_CHANGED";

            case RIL_UNSOL_OEM_HOOK_RAW: return "RIL_UNSOL_OEM_HOOK_RAW";

            default: return "<unknown reponse>";

        }

    }

telephony/java/com/android/internal/telephony/RILConstants.java

+5 −0
Original line number Diff line number Diff line
@@ -233,4 +233,9 @@ cat include/telephony/ril.h | \ 
    int RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS = 1021;

    int RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL = 1022;

    int RIL_UNSOL_RESTRICTED_STATE_CHANGED = 1023;

    int RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE = 1024;

    int RIL_UNSOL_CDMA_CALL_WAITING = 1025;

    int RIL_UNSOL_CDMA_OTA_PROVISION_STATUS = 1026;

    int RIL_UNSOL_CDMA_INFO_REC = 1027;

    int RIL_UNSOL_OEM_HOOK_RAW = 1028;

}