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

Commit e50e70d1 authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Dump radio halversion"

parents bd23a678 475ca590

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

+11 −0
Original line number Diff line number Diff line
@@ -609,6 +609,17 @@ public class PhoneFactory { 
        pw.decreaseIndent();

        pw.println("++++++++++++++++++++++++++++++++");



        pw.println("sRadioHalCapabilities:");

        pw.increaseIndent();

        try {

            sRadioHalCapabilities.dump(fd, pw, args);

        } catch (Exception e) {

            e.printStackTrace();

        }

        pw.flush();

        pw.decreaseIndent();

        pw.println("++++++++++++++++++++++++++++++++");



        pw.println("LocalLogs:");

        pw.increaseIndent();

        synchronized (sLocalLogs) {

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

+7 −0
Original line number Diff line number Diff line
@@ -6340,6 +6340,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("RIL: " + this);

        pw.println(" " + mServiceProxies.get(HAL_SERVICE_DATA));

        pw.println(" " + mServiceProxies.get(HAL_SERVICE_MESSAGING));

        pw.println(" " + mServiceProxies.get(HAL_SERVICE_MODEM));

        pw.println(" " + mServiceProxies.get(HAL_SERVICE_NETWORK));

        pw.println(" " + mServiceProxies.get(HAL_SERVICE_SIM));

        pw.println(" " + mServiceProxies.get(HAL_SERVICE_VOICE));

        pw.println(" " + mServiceProxies.get(HAL_SERVICE_IMS));

        pw.println(" mWakeLock=" + mWakeLock);

        pw.println(" mWakeLockTimeout=" + mWakeLockTimeout);

        synchronized (mRequestList) {

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

+5 −0
Original line number Diff line number Diff line
@@ -642,4 +642,9 @@ public class RadioConfig extends Handler { 
    private static void loge(String log) {

        Rlog.e(TAG, log);

    }



    @Override

    public String toString() {

        return "RadioConfig[" + "mRadioConfigProxy=" + mRadioConfigProxy + ']';

    }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -336,4 +336,11 @@ public class RadioConfigProxy { 
                    mRadioConfig.obtainMessage(RadioConfig.EVENT_AIDL_SERVICE_DEAD));

        }

    }



    @Override

    public String toString() {

        return "RadioConfigProxy["

                + "mRadioHalVersion=" + mRadioHalVersion

                + ", mRadioConfigHalVersion=" + mRadioConfigHalVersion + ']';

    }

}

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

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import android.util.Log; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Collections;

import java.util.Set;
@@ -164,6 +166,13 @@ public class RadioInterfaceCapabilityController extends Handler { 
        }

    }



    /**

     * Dump the fields of the instance

     */

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("mRadioConfig=" + mRadioConfig);

    }



    private static void log(final String s) {

        Rlog.d(LOG_TAG, s);

    }