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

Commit bad9b1a1 authored by sqian's avatar sqian Committed by android-build-merger
Browse files

Merge "Change log for imei" am: 2f805878 am: 2d47b258 

am: 9d794563

Change-Id: I510e3e415197c7bd86b54333fdbcc319972e9a83
parents 905f26dd 9d794563

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

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.telephony.ModemActivityInfo; 
import android.telephony.NeighboringCellInfo;

import android.telephony.PhoneNumberUtils;

import android.telephony.RadioAccessFamily;

import android.telephony.Rlog;

import android.telephony.SignalStrength;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -64,6 +65,8 @@ import java.util.Collections; 
import java.util.List;



public class RadioResponse extends IRadioResponse.Stub {

    private static final String TAG = RadioResponse.class.getSimpleName();



    // The number of the required config values for broadcast SMS stored in the C struct

    // RIL_CDMA_BroadcastServiceInfo

    private static final int CDMA_BSI_NO_OF_INTS_STRUCT = 3;
@@ -1014,7 +1017,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
     */

    public void getDeviceIdentityResponse(RadioResponseInfo responseInfo, String imei,

                                          String imeisv, String esn, String meid) {

        responseStrings(responseInfo, imei, imeisv, esn, meid);

        responseStrings(responseInfo, Rlog.pii(TAG, imei), imeisv, esn, meid);

    }



    /**