Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev

            app.setPid(startResult.pid);

            app.usingWrapper = startResult.usingWrapper;

            app.removed = false;

            synchronized (mPidsSelfLocked) {

            ProcessRecord oldApp;

            synchronized (mPidsSelfLocked) {

                oldApp = mPidsSelfLocked.get(startResult.pid);

            }

            // If there is already an app occupying that pid that hasn't been cleaned up

                if ((oldApp = mPidsSelfLocked.get(startResult.pid)) != null && !app.isolated) {

            if (oldApp != null && !app.isolated) {

                // Clean up anything relating to this pid first

                Slog.w(TAG, "Reusing pid " + startResult.pid

                        + " while app is still mapped to it");

                cleanUpApplicationRecordLocked(oldApp, false, false, -1,

                        true /*replacingPid*/);

            }

            synchronized (mPidsSelfLocked) {

                this.mPidsSelfLocked.put(startResult.pid, app);

                Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);

                msg.obj = app;