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

2017-02-21 18:59:59 +00:00
parent 7897bb89a9 735a8d8fe9
commit 56b2dcd54f
1 changed files with 7 additions and 1 deletions
--- 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;
        }

        /**