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

Commit 5bd4e9a7 authored by Qiongcheng Luo's avatar Qiongcheng Luo Committed by Jordan Liu
Browse files

Log phone id for debugging multi SIM devices 

Some telephony classes like GsmCdmaPhone, ImsPhone, etc. are created
per slot in multi SIM devices. It is better to output phone id for
debugging multi SIM devices.

Test: manual - Verified that some logs are output with phone id, run
telephony unit tests
Bug: 69657265
Change-Id: I174e1bc67e436e131a2a7a0abc0585c7d69598a3
parent 2597aac7

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

+1 −1
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ public class GsmCdmaCallTracker extends CallTracker { 


    @Override

    protected void log(String msg) {

        Rlog.d(LOG_TAG, "[GsmCdmaCallTracker] " + msg);

        Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + msg);

    }



    @Override

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

+3 −3
Original line number Diff line number Diff line
@@ -3545,15 +3545,15 @@ public class GsmCdmaPhone extends Phone { 
    }



    private void logd(String s) {

        Rlog.d(LOG_TAG, "[GsmCdmaPhone] " + s);

        Rlog.d(LOG_TAG, "[" + mPhoneId + "] " + s);

    }



    private void logi(String s) {

        Rlog.i(LOG_TAG, "[GsmCdmaPhone] " + s);

        Rlog.i(LOG_TAG, "[" + mPhoneId + "] " + s);

    }



    private void loge(String s) {

        Rlog.e(LOG_TAG, "[GsmCdmaPhone] " + s);

        Rlog.e(LOG_TAG, "[" + mPhoneId + "] " + s);

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -2424,11 +2424,11 @@ public class ServiceStateTracker extends Handler { 
    }



    protected final void log(String s) {

        Rlog.d(LOG_TAG, s);

        Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + s);

    }



    protected final void loge(String s) {

        Rlog.e(LOG_TAG, s);

        Rlog.e(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + s);

    }



    /**

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+76 −73

File changed.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+2 −3
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ import com.android.internal.telephony.CommandsInterface; 
import com.android.internal.telephony.Connection;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneInternalInterface;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.dataconnection.DataEnabledSettings;
@@ -3101,11 +3100,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


    @Override

    protected void log(String msg) {

        Rlog.d(LOG_TAG, "[ImsPhoneCallTracker] " + msg);

        Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + msg);

    }



    protected void loge(String msg) {

        Rlog.e(LOG_TAG, "[ImsPhoneCallTracker] " + msg);

        Rlog.e(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + msg);

    }



    /**