summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2015-06-21 20:46:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-21 20:46:42 +0000
commit5ab0ae0e387078914457774e5c82308f3cc9b5e3 (patch)
tree6b3e4c094a7f3e4e0dddb17f506ec224d9b9e20a /media
parent70289a6e8a60c9a2b91d409dfedd2aea7bce6620 (diff)
parent40c5c7dcdc9f39100833e86884d86fb7643ffa4b (diff)
downloadframeworks_base-5ab0ae0e387078914457774e5c82308f3cc9b5e3.zip
frameworks_base-5ab0ae0e387078914457774e5c82308f3cc9b5e3.tar.gz
frameworks_base-5ab0ae0e387078914457774e5c82308f3cc9b5e3.tar.bz2
Merge "TIF: Fix a typo" into mnc-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/tv/TvInputManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index 01de898..38f2d04 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -1978,7 +1978,7 @@ public final class TvInputManager {
mPendingEvents.removeAt(index);
if (timeout) {
- Log.w(TAG, "Timeout waiting for seesion to handle input event after "
+ Log.w(TAG, "Timeout waiting for session to handle input event after "
+ INPUT_SESSION_NOT_RESPONDING_TIMEOUT + " ms: " + mToken);
} else {
mHandler.removeMessages(InputEventHandler.MSG_TIMEOUT_INPUT_EVENT, p);