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

Commit a3169e7f authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Simplified dump of ArrayList<Pair<Integer, Integer>> in SSC" am: 060d6328 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1881330

Change-Id: I75f0d6b806239e6ad3c7fab3a7a2b65168317787
parents 930085c3 060d6328

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

+2 −21
Original line number Diff line number Diff line
@@ -480,31 +480,12 @@ public class SignalStrengthController extends Handler { 
        pw.println(" mSignalStrength=" + mSignalStrength);

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

        pw.println(" mNrRsrpBoost=" + Arrays.toString(mNrRsrpBoost));

        dumpEarfcnPairList(pw, mEarfcnPairListForRsrpBoost, "mEarfcnPairListForRsrpBoost");

        dumpEarfcnPairList(pw, mNrarfcnRangeListForRsrpBoost, "mNrarfcnRangeListForRsrpBoost");

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

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

        ipw.decreaseIndent();

        ipw.flush();

    }



    private void dumpEarfcnPairList(PrintWriter pw, ArrayList<Pair<Integer, Integer>> pairList,

            String name) {

        pw.print(" " + name + "={");

        if (pairList != null) {

            int i = pairList.size();

            for (Pair<Integer, Integer> earfcnPair : pairList) {

                pw.print("(");

                pw.print(earfcnPair.first);

                pw.print(",");

                pw.print(earfcnPair.second);

                pw.print(")");

                if ((--i) != 0) {

                    pw.print(",");

                }

            }

        }

        pw.println("}");

    }



    /**

     * Set a new request to update the signal strength thresholds.

     */