Merge "Framework did not notifyDisplayInfoChanged" am: bd085080f7
Change-Id: I81e1c11f0e02f1e7273c455ca84f041788281d5e
This commit is contained in:
@@ -1538,17 +1538,15 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
|
|||||||
}
|
}
|
||||||
synchronized (mRecords) {
|
synchronized (mRecords) {
|
||||||
if (validatePhoneId(phoneId)) {
|
if (validatePhoneId(phoneId)) {
|
||||||
if (mDisplayInfos[phoneId] != null) {
|
mDisplayInfos[phoneId] = displayInfo;
|
||||||
mDisplayInfos[phoneId] = displayInfo;
|
for (Record r : mRecords) {
|
||||||
for (Record r : mRecords) {
|
if (r.matchPhoneStateListenerEvent(
|
||||||
if (r.matchPhoneStateListenerEvent(
|
PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED)
|
||||||
PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED)
|
&& idMatch(r.subId, subId, phoneId)) {
|
||||||
&& idMatch(r.subId, subId, phoneId)) {
|
try {
|
||||||
try {
|
r.callback.onDisplayInfoChanged(displayInfo);
|
||||||
r.callback.onDisplayInfoChanged(displayInfo);
|
} catch (RemoteException ex) {
|
||||||
} catch (RemoteException ex) {
|
mRemoveList.add(r.binder);
|
||||||
mRemoveList.add(r.binder);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user