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

Commit 45ef8087 authored by yinxu's avatar yinxu
Browse files

Add logs for RadioConfig 

Bug:78118600
Test: Unit Test

Change-Id: I4ad8adcb53a77383dc2fa3832a4a574c1ebb63d0
parent efeba18b

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import android.util.SparseArray; 
import com.android.internal.telephony.uicc.IccSlotStatus;

import com.android.internal.telephony.uicc.IccSlotStatus;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.concurrent.atomic.AtomicLong;

import java.util.concurrent.atomic.AtomicLong;





/**

/**
@@ -266,7 +267,8 @@ public class RadioConfig extends Handler { 
                    mDefaultWorkSource);

                    mDefaultWorkSource);





            if (DBG) {

            if (DBG) {

                logd(rr.serialString() + "> " + requestToString(rr.mRequest));

                logd(rr.serialString() + "> " + requestToString(rr.mRequest)

                        + " " + Arrays.toString(physicalSlots));

            }

            }





            try {

            try {
@@ -286,7 +288,7 @@ public class RadioConfig extends Handler { 
        return arrayList;

        return arrayList;

    }

    }





    private static String requestToString(int request) {

    static String requestToString(int request) {

        switch (request) {

        switch (request) {

            case RIL_REQUEST_GET_SLOT_STATUS:

            case RIL_REQUEST_GET_SLOT_STATUS:

                return "GET_SLOT_STATUS";

                return "GET_SLOT_STATUS";

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.internal.telephony; 
import android.hardware.radio.config.V1_0.IRadioConfigIndication;

import android.hardware.radio.config.V1_0.IRadioConfigIndication;

import android.hardware.radio.config.V1_0.SimSlotStatus;

import android.hardware.radio.config.V1_0.SimSlotStatus;

import android.os.AsyncResult;

import android.os.AsyncResult;

import android.telephony.Rlog;





import com.android.internal.telephony.uicc.IccSlotStatus;

import com.android.internal.telephony.uicc.IccSlotStatus;
@@ -29,6 +30,7 @@ import java.util.ArrayList; 
 */

 */

public class RadioConfigIndication extends IRadioConfigIndication.Stub {

public class RadioConfigIndication extends IRadioConfigIndication.Stub {

    private final RadioConfig mRadioConfig;

    private final RadioConfig mRadioConfig;

    private static final String TAG = "RadioConfigIndication";





    public RadioConfigIndication(RadioConfig radioConfig) {

    public RadioConfigIndication(RadioConfig radioConfig) {

        mRadioConfig = radioConfig;

        mRadioConfig = radioConfig;
@@ -39,7 +41,7 @@ public class RadioConfigIndication extends IRadioConfigIndication.Stub { 
     */

     */

    public void simSlotsStatusChanged(int indicationType, ArrayList<SimSlotStatus> slotStatus) {

    public void simSlotsStatusChanged(int indicationType, ArrayList<SimSlotStatus> slotStatus) {

        ArrayList<IccSlotStatus> ret = RadioConfig.convertHalSlotStatus(slotStatus);

        ArrayList<IccSlotStatus> ret = RadioConfig.convertHalSlotStatus(slotStatus);



        Rlog.d(TAG, "[UNSL]< " + " UNSOL_SIM_SLOT_STATUS_CHANGED " + ret.toString());

        if (mRadioConfig.mSimSlotStatusRegistrant != null) {

        if (mRadioConfig.mSimSlotStatusRegistrant != null) {

            mRadioConfig.mSimSlotStatusRegistrant.notifyRegistrant(

            mRadioConfig.mSimSlotStatusRegistrant.notifyRegistrant(

                    new AsyncResult(null, ret, null));

                    new AsyncResult(null, ret, null));

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

+19 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.hardware.radio.V1_0.RadioError; 
import android.hardware.radio.V1_0.RadioResponseInfo;

import android.hardware.radio.V1_0.RadioResponseInfo;

import android.hardware.radio.config.V1_0.IRadioConfigResponse;

import android.hardware.radio.config.V1_0.IRadioConfigResponse;

import android.hardware.radio.config.V1_0.SimSlotStatus;

import android.hardware.radio.config.V1_0.SimSlotStatus;

import android.telephony.Rlog;





import com.android.internal.telephony.uicc.IccSlotStatus;

import com.android.internal.telephony.uicc.IccSlotStatus;
@@ -30,6 +31,7 @@ import java.util.ArrayList; 
 */

 */

public class RadioConfigResponse extends IRadioConfigResponse.Stub {

public class RadioConfigResponse extends IRadioConfigResponse.Stub {

    private final RadioConfig mRadioConfig;

    private final RadioConfig mRadioConfig;

    private static final String TAG = "RadioConfigResponse";





    public RadioConfigResponse(RadioConfig radioConfig) {

    public RadioConfigResponse(RadioConfig radioConfig) {

        mRadioConfig = radioConfig;

        mRadioConfig = radioConfig;
@@ -47,9 +49,17 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                // send response

                // send response

                RadioResponse.sendMessageResponse(rr.mResult, ret);

                RadioResponse.sendMessageResponse(rr.mResult, ret);

                Rlog.d(TAG, rr.serialString() + "< "

                        + mRadioConfig.requestToString(rr.mRequest) + " " + ret.toString());

            } else {

            } else {

                rr.onError(responseInfo.error, ret);

                rr.onError(responseInfo.error, ret);

                Rlog.e(TAG, rr.serialString() + "< "

                        + mRadioConfig.requestToString(rr.mRequest) + " error "

                        + responseInfo.error);

            }

            }



        } else {

            Rlog.e(TAG, "getSimSlotsStatusResponse: Error " + responseInfo.toString());

        }

        }

    }

    }
@@ -63,9 +73,18 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                // send response

                // send response

                RadioResponse.sendMessageResponse(rr.mResult, null);

                RadioResponse.sendMessageResponse(rr.mResult, null);

                Rlog.d(TAG, rr.serialString() + "< "

                        + mRadioConfig.requestToString(rr.mRequest));

            } else {

            } else {

                rr.onError(responseInfo.error, null);

                rr.onError(responseInfo.error, null);

                Rlog.e(TAG, rr.serialString() + "< "

                        + mRadioConfig.requestToString(rr.mRequest) + " error "

                        + responseInfo.error);

            }

            }

        } else {

            Rlog.e(TAG, "setSimSlotsMappingResponse: Error " + responseInfo.toString());

        }

        }

    }

    }





}
 
}