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); + } } }