Merge "Fix a race in AMS.getContentProviderImpl()."

                }

            }

            boolean providerRunning = cpr != null && cpr.proc != null && !cpr.proc.killed;

            boolean providerRunning = false;

            if (cpr != null && cpr.proc != null) {

                providerRunning = !cpr.proc.killed;

                // Note if killedByAm is also set, this means the provider process has just been

                // killed by AM (in ProcessRecord.kill()), but appDiedLocked() hasn't been called

                // yet. So we need to call appDiedLocked() here and let it clean up.

                // (See the commit message on I2c4ba1e87c2d47f2013befff10c49b3dc337a9a7 to see

                // how to test this case.)

                if (cpr.proc.killed && cpr.proc.killedByAm) {

                    checkTime(startTime, "getContentProviderImpl: before appDied (killedByAm)");

                    appDiedLocked(cpr.proc);

                    checkTime(startTime, "getContentProviderImpl: after appDied (killedByAm)");

                }

            }

            if (providerRunning) {

                cpi = cpr.info;

                String msg;