Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent multiple calls to queryDisplayStatus"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-27 14:45:48 +00:00
committed by Android (Google) Code Review
parent 1ef67f1e23 a4f1117e76
commit f3f3ae19ae
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -92,6 +92,7 @@ import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -2680,15 +2681,26 @@ public class HdmiControlService extends SystemService {
private void announceHdmiControlStatusChange(boolean isEnabled) {
assertRunOnServiceThread();
synchronized (mLock) {
List<IHdmiControlStatusChangeListener> listeners = new ArrayList<>(
mHdmiControlStatusChangeListenerRecords.size());
for (HdmiControlStatusChangeListenerRecord record :
mHdmiControlStatusChangeListenerRecords) {
invokeHdmiControlStatusChangeListenerLocked(record.mListener, isEnabled);
listeners.add(record.mListener);
}
invokeHdmiControlStatusChangeListenerLocked(listeners, isEnabled);
}
}
private void invokeHdmiControlStatusChangeListenerLocked(
IHdmiControlStatusChangeListener listener, boolean isEnabled) {
invokeHdmiControlStatusChangeListenerLocked(Collections.singletonList(listener), isEnabled);
}
private void invokeHdmiControlStatusChangeListenerLocked(
Collection<IHdmiControlStatusChangeListener> listeners, boolean isEnabled) {
if (listeners.isEmpty()) {
return;
}
if (isEnabled) {
queryDisplayStatus(new IHdmiControlCallback.Stub() {
public void onComplete(int status) {
@@ -2698,23 +2710,25 @@ public class HdmiControlService extends SystemService {
|| status == HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE) {
isAvailable = false;
}
try {
listener.onStatusChange(isEnabled, isAvailable);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to report HdmiControlStatusChange: " + isEnabled
+ " isAvailable: " + isAvailable, e);
}
invokeHdmiControlStatusChangeListenerLocked(listeners, isEnabled, isAvailable);
}
});
return;
}
invokeHdmiControlStatusChangeListenerLocked(listeners, isEnabled, false);
}
try {
listener.onStatusChange(isEnabled, false);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to report HdmiControlStatusChange: " + isEnabled
+ " isAvailable: " + false, e);
private void invokeHdmiControlStatusChangeListenerLocked(
Collection<IHdmiControlStatusChangeListener> listeners, boolean isEnabled,
boolean isCecAvailable) {
for (IHdmiControlStatusChangeListener listener : listeners) {
try {
listener.onStatusChange(isEnabled, isCecAvailable);
} catch (RemoteException e) {
Slog.e(TAG,
"Failed to report HdmiControlStatusChange: " + isEnabled + " isAvailable: "
+ isCecAvailable, e);
}
}
}