commit 56b2dcd54ff2426105ef90a9a3ceef7f63865120
author Conrad Chen <conradchen@google.com> Tue Feb 21 18:59:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 19:00:02 2017 +0000
tree 0a7dcc2ed9c1283ecdb325689659fa8861188532
parent 7897bb89a90dc630c29eeaa4cbf9e1a75ac1a1cc
parent 735a8d8fe96c78e4cd01123d502f64fdf530abe9

Merge "TIF: fix NPE caused by invalid component name"

media/java/android/media/tv/TvInputInfo.java

diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index 3b74ee7..35988d4 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -694,10 +694,16 @@
          *            {@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;
         }
 
         /**