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

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

Change-Id: I7a1dd3a6603944f677b07e78ebe34a9c4c3660e9
This commit is contained in:
Sarah Chin
2020-10-30 03:09:49 +00:00
committed by Automerger Merge Worker

View File

@@ -1604,10 +1604,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (!checkNotifyPermission("notifyDisplayInfoChanged()")) { if (!checkNotifyPermission("notifyDisplayInfoChanged()")) {
return; return;
} }
String str = "notifyDisplayInfoChanged: PhoneId=" + phoneId + " subId=" + subId
+ " telephonyDisplayInfo=" + telephonyDisplayInfo;
if (VDBG) { if (VDBG) {
log("notifyDisplayInfoChanged: PhoneId=" + phoneId log(str);
+ " subId=" + subId + " telephonyDisplayInfo=" + telephonyDisplayInfo);
} }
mLocalLog.log(str);
synchronized (mRecords) { synchronized (mRecords) {
if (validatePhoneId(phoneId)) { if (validatePhoneId(phoneId)) {
mTelephonyDisplayInfos[phoneId] = telephonyDisplayInfo; mTelephonyDisplayInfos[phoneId] = telephonyDisplayInfo;
@@ -2295,10 +2297,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
pw.println("mOutgoingCallEmergencyNumber=" + mOutgoingCallEmergencyNumber[i]); pw.println("mOutgoingCallEmergencyNumber=" + mOutgoingCallEmergencyNumber[i]);
pw.println("mOutgoingSmsEmergencyNumber=" + mOutgoingSmsEmergencyNumber[i]); pw.println("mOutgoingSmsEmergencyNumber=" + mOutgoingSmsEmergencyNumber[i]);
pw.println("mBarringInfo=" + mBarringInfo.get(i)); pw.println("mBarringInfo=" + mBarringInfo.get(i));
pw.println("mTelephonyDisplayInfo=" + mTelephonyDisplayInfos[i]);
pw.decreaseIndent(); pw.decreaseIndent();
} }
pw.println("mCarrierNetworkChangeState=" + mCarrierNetworkChangeState); pw.println("mCarrierNetworkChangeState=" + mCarrierNetworkChangeState);
pw.println("mPhoneCapability=" + mPhoneCapability); pw.println("mPhoneCapability=" + mPhoneCapability);
pw.println("mActiveDataSubId=" + mActiveDataSubId); pw.println("mActiveDataSubId=" + mActiveDataSubId);
pw.println("mRadioPowerState=" + mRadioPowerState); pw.println("mRadioPowerState=" + mRadioPowerState);