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

Commit a38a878d authored by Yoshiaki Naka's avatar Yoshiaki Naka Committed by android-build-merger
Browse files

Merge "P2 value should also be output to radio log" am: 1558cc6d 

am: 544e391c

Change-Id: Ic3a151d3b409d130de0be91443c35de1c4758208
parents 7dc10029 544e391c

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

+8 −5
Original line number Diff line number Diff line
@@ -3301,8 +3301,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            if (RILJ_LOGD) {

                if (Build.IS_DEBUGGABLE) {

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

                            + " cla = " + cla + " instruction = " + instruction

                            + " p1 = " + p1 + " p2 = " + " p3 = " + p3 + " data = " + data);

                            + String.format(" cla = 0x%02X ins = 0x%02X", cla, instruction)

                            + String.format(" p1 = 0x%02X p2 = 0x%02X p3 = 0x%02X", p1, p2, p3)

                            + " data = " + data);

                } else {

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

                }
@@ -3377,9 +3378,11 @@ public class RIL extends BaseCommands implements CommandsInterface { 


            if (RILJ_LOGD) {

                if (Build.IS_DEBUGGABLE) {

                    riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " channel = "

                            + channel + " cla = " + cla + " instruction = " + instruction

                            + " p1 = " + p1 + " p2 = " + " p3 = " + p3 + " data = " + data);

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

                            + String.format(" channel = %d", channel)

                            + String.format(" cla = 0x%02X ins = 0x%02X", cla, instruction)

                            + String.format(" p1 = 0x%02X p2 = 0x%02X p3 = 0x%02X", p1, p2, p3)

                            + " data = " + data);

                } else {

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

                }