Merge "Fix am start -S <package>"

package com.android.server.am;

import static android.app.ActivityManagerInternal.ALLOW_NON_FULL;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ActivityTaskManager.RESIZE_MODE_SYSTEM;

import static android.app.ActivityTaskManager.RESIZE_MODE_USER;

                if (intent.getComponent() != null) {

                    packageName = intent.getComponent().getPackageName();

                } else {

                    // queryIntentActivities does not convert user id, so we convert it here first

                    int userIdForQuery = mInternal.mUserController.handleIncomingUser(

                            Binder.getCallingPid(), Binder.getCallingUid(), mUserId, false,

                            ALLOW_NON_FULL, "ActivityManagerShellCommand", null);

                    List<ResolveInfo> activities = mPm.queryIntentActivities(intent, mimeType, 0,

                            mUserId).getList();

                            userIdForQuery).getList();

                    if (activities == null || activities.size() <= 0) {

                        getErrPrintWriter().println("Error: Intent does not match any activities: "

                                + intent);