Merge "App launch test apk change"

    private Map<String, Intent> mNameToIntent;

    private Map<String, String> mNameToProcess;

    private List<LaunchOrder> mLaunchOrderList = new ArrayList<LaunchOrder>();

    private Map<String, String> mNameToResultKey;

    private Map<String, List<Long>> mNameToLaunchTime;

    private void createMappings() {

        mNameToIntent = new LinkedHashMap<String, Intent>();

        mNameToProcess = new LinkedHashMap<String, String>();

        PackageManager pm = getInstrumentation().getContext()

                .getPackageManager();

                        ri.activityInfo.name);

                String appName = ri.loadLabel(pm).toString();

                if (appName != null) {

                    // Support launching intent using package name or app name

                    mNameToIntent.put(ri.activityInfo.packageName, startIntent);

                    mNameToIntent.put(appName, startIntent);

                    mNameToProcess.put(appName, ri.activityInfo.processName);

                }

            }

        }