diff options
| author | Dongwon Kang <dwkang@google.com> | 2014-07-22 14:14:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-22 14:14:25 +0000 |
| commit | 63551821f7becd6bb5b30bb2c2dfafe713ecdac0 (patch) | |
| tree | 803e42a5e95e6b86600fd4bd741d376b79a9f010 /services | |
| parent | a2792caec53b3dbcc39e6d7897e738a9fcf3fc4b (diff) | |
| parent | 70aa02ee7f2de1da301995d43b10d8e6f1c336a0 (diff) | |
| download | frameworks_base-63551821f7becd6bb5b30bb2c2dfafe713ecdac0.zip frameworks_base-63551821f7becd6bb5b30bb2c2dfafe713ecdac0.tar.gz frameworks_base-63551821f7becd6bb5b30bb2c2dfafe713ecdac0.tar.bz2 | |
am 0de4f4dd: am 1bb343ff: am a792fc8a: Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev
* commit '0de4f4dd6353937f36c5fccb0a95450f94ad873b':
TIF: Revisit types in TvInputInfo and TvContract.Channels.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/tv/TvInputHardwareManager.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java index 8854869..ea19012 100644 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -211,9 +211,6 @@ class TvInputHardwareManager implements TvInputHal.Callback { } public void addHardwareTvInput(int deviceId, TvInputInfo info) { - if (info.getType() == TvInputInfo.TYPE_VIRTUAL) { - throw new IllegalArgumentException("info (" + info + ") has virtual type."); - } synchronized (mLock) { String oldInputId = mHardwareInputIdMap.get(deviceId); if (oldInputId != null) { |