Merge "Merge "Prevent NPE while finishing activity" into rvc-dev am:... (d31c60aa) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1685,6 +1685,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		final NeededUriGrants resultGrants = collectGrants(resultData, r.resultTo);

		synchronized (mGlobalLock) {
		// Sanity check in case activity was removed before entering global lock.
		if (!r.isInHistory()) {
		return true;
		}

		// Keep track of the root activity of the task before we finish it
		final Task tr = r.getTask();
		final ActivityRecord rootR = tr.getRootActivity();