From 9127e4580c618bc1afae5c2c280f5a271f7a7635 Mon Sep 17 00:00:00 2001
From: Jae Seo <jaeseo@google.com>
Date: Wed, 10 Sep 2014 13:11:13 -0700
Subject: [PATCH] TIF: Enable inflating class android.media.tv.TvView on non-TV
 devices

Needed to pass the CTS for those devices.

Bug: 17455222
Change-Id: Ief9a76835418906d9e8e06d4e5ddc71a3370055d
---
 media/java/android/media/tv/TvInputManager.java | 4 +++-
 media/java/android/media/tv/TvView.java         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index d2deb66e00339..b7a230c6b041b 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -709,7 +709,9 @@ public final class TvInputManager {
             }
         };
         try {
-            mService.registerCallback(mManagerCallback, mUserId);
+            if (mService != null) {
+                mService.registerCallback(mManagerCallback, mUserId);
+            }
         } catch (RemoteException e) {
             Log.e(TAG, "mService.registerCallback failed: " + e);
         }
diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index 4171e6d3e8410..213e34ce22f4f 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -312,7 +312,9 @@ public class TvView extends ViewGroup {
             // is newly assigned for every createSession request and compared with
             // MySessionCreateCallback.this.
             mSessionCallback = new MySessionCallback(inputId, channelUri, params);
-            mTvInputManager.createSession(inputId, mSessionCallback, mHandler);
+            if (mTvInputManager != null) {
+                mTvInputManager.createSession(inputId, mSessionCallback, mHandler);
+            }
         }
     }