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

Commit 55af3f19 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add local logs for TelephonyDisplayInfo changed" am: 02ae7ec0 am:... 

Merge "Add local logs for TelephonyDisplayInfo changed" am: 02ae7ec0 am: 8787e9f3 am: be7ea710

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480311

Change-Id: Id00c3871407a1c65e720a35738ffb5c899f10d1b
parents 6d87612e be7ea710

services/core/java/com/android/server/TelephonyRegistry.java

+5 −3
Original line number Diff line number Diff line
@@ -1606,10 +1606,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        if (!checkNotifyPermission("notifyDisplayInfoChanged()")) {

            return;

        }

        String str = "notifyDisplayInfoChanged: PhoneId=" + phoneId + " subId=" + subId

                + " telephonyDisplayInfo=" + telephonyDisplayInfo;

        if (VDBG) {

            log("notifyDisplayInfoChanged: PhoneId=" + phoneId

                    + " subId=" + subId + " telephonyDisplayInfo=" + telephonyDisplayInfo);

            log(str);

        }

        mLocalLog.log(str);

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mTelephonyDisplayInfos[phoneId] = telephonyDisplayInfo;
@@ -2298,10 +2300,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                pw.println("mOutgoingCallEmergencyNumber=" + mOutgoingCallEmergencyNumber[i]);

                pw.println("mOutgoingSmsEmergencyNumber=" + mOutgoingSmsEmergencyNumber[i]);

                pw.println("mBarringInfo=" + mBarringInfo.get(i));

                pw.println("mTelephonyDisplayInfo=" + mTelephonyDisplayInfos[i]);

                pw.decreaseIndent();

            }

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



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

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

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