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

DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.

Browse Source 
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357e)
This commit is contained in:
Dongwon Kang
2014-12-26 14:53:14 +09:00
parent ad1e3d7df4
commit 017bb8523d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,10 +216,13 @@ class TvInputHardwareManager implements TvInputHal.Callback {
mHandler.obtainMessage(ListenerHandler.STATE_CHANGED, mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
convertConnectedToState(configs.length > 0), 0, inputId).sendToTarget(); convertConnectedToState(configs.length > 0), 0, inputId).sendToTarget();
} }
try { ITvInputHardwareCallback callback = connection.getCallbackLocked();
connection.getCallbackLocked().onStreamConfigChanged(configs); if (callback != null) {
} catch (RemoteException e) { try {
Slog.e(TAG, "error in onStreamConfigurationChanged", e); callback.onStreamConfigChanged(configs);
} catch (RemoteException e) {
Slog.e(TAG, "error in onStreamConfigurationChanged", e);
}
} }
} }
} }