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

am 1d96b28d: am f0a8c3e6: Merge "TIF: fix NPE for TvInputHardwareManager" into lmp-mr1-dev

Browse Source 
* commit '1d96b28d1d8d6882c30604721b81ac5dab1323d6':
  TIF: fix NPE for TvInputHardwareManager
This commit is contained in:
Jae Seo
2014-11-18 18:22:15 +00:00
committed by Android Git Automerger
parent 3e846cb53c 1d96b28d1d
commit 723b3dd579
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -673,28 +673,35 @@ class TvInputHardwareManager implements TvInputHal.Callback {
if (mReleased) { if (mReleased) {
throw new IllegalStateException("Device already released."); throw new IllegalStateException("Device already released.");
} }
if (surface != null && config == null) {
return false;
}
if (surface == null && mActiveConfig == null) {
return false;
}
int result = TvInputHal.ERROR_UNKNOWN; int result = TvInputHal.ERROR_UNKNOWN;
if (surface == null) { if (surface == null) {
result = mHal.removeStream(mInfo.getDeviceId(), mActiveConfig); // The value of config is ignored when surface == null.
mActiveConfig = null; if (mActiveConfig != null) {
result = mHal.removeStream(mInfo.getDeviceId(), mActiveConfig);
mActiveConfig = null;
} else {
// We already have no active stream.
return true;
}
} else { } else {
if (!config.equals(mActiveConfig)) { // It's impossible to set a non-null surface with a null config.
if (config == null) {
return false;
}
// Remove stream only if we have an existing active configuration.
if (mActiveConfig != null && !config.equals(mActiveConfig)) {
result = mHal.removeStream(mInfo.getDeviceId(), mActiveConfig); result = mHal.removeStream(mInfo.getDeviceId(), mActiveConfig);
if (result != TvInputHal.SUCCESS) { if (result != TvInputHal.SUCCESS) {
mActiveConfig = null; mActiveConfig = null;
return false;
} }
} }
result = mHal.addOrUpdateStream(mInfo.getDeviceId(), surface, config); // Proceed only if all previous operations succeeded.
if (result == TvInputHal.SUCCESS) { if (result == TvInputHal.SUCCESS) {
mActiveConfig = config; result = mHal.addOrUpdateStream(mInfo.getDeviceId(), surface, config);
if (result == TvInputHal.SUCCESS) {
mActiveConfig = config;
}
} }
} }
updateAudioConfigLocked(); updateAudioConfigLocked();