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

Merge "TIF: fix NPE at onHdmiDeviceUpdated()" into lmp-mr1-dev

Browse Source
This commit is contained in:
Wonsik Kim
2014-10-08 16:04:54 +00:00
committed by Android (Google) Code Review
parent 7bbf867b9c 184a6d69b1
commit e2d53989cb
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -914,11 +914,18 @@ class TvInputHardwareManager implements TvInputHal.Callback {
break;
}
case HDMI_DEVICE_UPDATED: {
SomeArgs args = (SomeArgs) msg.obj;
String inputId = (String) args.arg1;
HdmiDeviceInfo info = (HdmiDeviceInfo) args.arg2;
args.recycle();
mListener.onHdmiDeviceUpdated(inputId, info);
HdmiDeviceInfo info = (HdmiDeviceInfo) msg.obj;
String inputId = null;
synchronized (mLock) {
inputId = mHdmiInputIdMap.get(info.getId());
}
if (inputId != null) {
mListener.onHdmiDeviceUpdated(inputId, info);
} else {
Slog.w(TAG, "Could not resolve input ID matching the device info; "
+ "ignoring.");
}
break;
}
default: {
Slog.w(TAG, "Unhandled message: " + msg);
@@ -986,11 +993,7 @@ class TvInputHardwareManager implements TvInputHal.Callback {
}
mHdmiDeviceList.add(deviceInfo);
messageType = ListenerHandler.HDMI_DEVICE_UPDATED;
String inputId = mHdmiInputIdMap.get(deviceInfo.getId());
SomeArgs args = SomeArgs.obtain();
args.arg1 = inputId;
args.arg2 = deviceInfo;
obj = args;
obj = deviceInfo;
break;
}
}