Merge "Add local logs for TelephonyDisplayInfo changed" am: 02ae7ec0f3 am: 8787e9f3f0

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

Change-Id: Ia9f89f052bf8b029b7afaf827fe2c9a6fcd19197
This commit is contained in:
Sarah Chin
2020-10-30 03:29:56 +00:00
committed by Automerger Merge Worker

View File

@@ -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);