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

Commit 97ca162d authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Log phone id for debugging multi SIM devices"

parents b58557f8 5bd4e9a7

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;
@@ -3106,11 +3105,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);

    }



    /**