Merge "Ensuring valid packageName when granting slice permission" into tm-dev...

import android.content.ContentProvider;

import android.content.Context;

import android.content.pm.parsing.FrameworkParsingPackageUtils;

import android.net.Uri;

import android.os.Environment;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.ArrayMap;

import android.util.ArraySet;

        public PkgUser(String pkg, int userId) {

            mPkg = pkg;

            mUserId = userId;

            enforceValidPackage();

        }

        public PkgUser(String pkgUserStr) throws IllegalArgumentException {

            } catch (Exception e) {

                throw new IllegalArgumentException(e);

            }

            enforceValidPackage();

        }

        private void enforceValidPackage() {

            String error = FrameworkParsingPackageUtils.validateName(

                    mPkg,

                    false /* requireSeparator */,

                    true /* requireFilename */);

            if (!TextUtils.isEmpty(error)) {

                throw new IllegalArgumentException((error));

            }

        }

        public String getPkg() {