Merge "Framework did not notifyDisplayInfoChanged" am: bd085080f7 am: 826ebc9827

Change-Id: I4346de593f42e72f948b672d5798858fed4900a2
This commit is contained in:
Treehugger Robot
2020-03-23 16:39:34 +00:00
committed by Automerger Merge Worker

View File

@@ -1560,17 +1560,15 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
synchronized (mRecords) {
if (validatePhoneId(phoneId)) {
if (mDisplayInfos[phoneId] != null) {
mDisplayInfos[phoneId] = displayInfo;
for (Record r : mRecords) {
if (r.matchPhoneStateListenerEvent(
PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED)
&& idMatch(r.subId, subId, phoneId)) {
try {
r.callback.onDisplayInfoChanged(displayInfo);
} catch (RemoteException ex) {
mRemoveList.add(r.binder);
}
mDisplayInfos[phoneId] = displayInfo;
for (Record r : mRecords) {
if (r.matchPhoneStateListenerEvent(
PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED)
&& idMatch(r.subId, subId, phoneId)) {
try {
r.callback.onDisplayInfoChanged(displayInfo);
} catch (RemoteException ex) {
mRemoveList.add(r.binder);
}
}
}