From 735a8d8fe96c78e4cd01123d502f64fdf530abe9 Mon Sep 17 00:00:00 2001
From: Conrad Chen <conradchen@google.com>
Date: Tue, 14 Feb 2017 18:02:37 -0800
Subject: [PATCH] TIF: fix NPE caused by invalid component name

Fixes NPE caused by invalid component name in TvInputInfo.Builder

Test: bug fix
Bug: 29457556
Change-Id: I92a77777373669c893299eaad7367a68aa458156
---
 media/java/android/media/tv/TvInputInfo.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index 3b74ee7ea723f..35988d40fe5d2 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -694,10 +694,16 @@ public final class TvInputInfo implements Parcelable {
          *            {@link TvInputService}.
          */
         public Builder(Context context, ComponentName component) {
-            mContext = context;
+            if (context == null) {
+                throw new IllegalArgumentException("context cannot be null.");
+            }
             Intent intent = new Intent(TvInputService.SERVICE_INTERFACE).setComponent(component);
             mResolveInfo = context.getPackageManager().resolveService(intent,
                     PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
+            if (mResolveInfo == null) {
+                throw new IllegalArgumentException("Invalid component. Can't find the service.");
+            }
+            mContext = context;
         }
 
         /**