Merge "Revert "Ensure only valid events are reported."" into udc-dev

        }

        @Override

        public void reportChooserSelection(@NonNull String packageName, int userId,

                @NonNull String contentType, String[] annotations, @NonNull String action) {

        public void reportChooserSelection(String packageName, int userId, String contentType,

                                           String[] annotations, String action) {

            if (packageName == null) {

                throw new IllegalArgumentException("Package selection must not be null.");

            }

            if (contentType == null) {

                throw new IllegalArgumentException("Content type for selection must not be null.");

            }

            if (action == null) {

                throw new IllegalArgumentException("Selection action must not be null.");

            }

            // Verify if this package exists before reporting an event for it.

            if (mPackageManagerInternal.getPackageUid(packageName, 0, userId) < 0) {

                Slog.w(TAG, "Event report user selecting an invalid package");

                Slog.w(TAG, "Event report user selecting a null package");

                return;

            }