am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev (00454026) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1314,7 +1314,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
	}		}
	}		}
	}		}
	ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;

	final int launchFlags = intent.getFlags();		final int launchFlags = intent.getFlags();

	@@ -1391,6 +1390,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
	}		}
	}		}

			final ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;

	if (err != ActivityManager.START_SUCCESS) {		if (err != ActivityManager.START_SUCCESS) {
	if (resultRecord != null) {		if (resultRecord != null) {
	resultStack.sendActivityResultLocked(-1,		resultStack.sendActivityResultLocked(-1,