Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b2dcd5 authored by Conrad Chen's avatar Conrad Chen Committed by Android (Google) Code Review
Browse files

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

parents 7897bb89 735a8d8f
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -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;
        }

        /**