From 6b942b8c52f7071ae6c590f3080c7e52dfef7d9e Mon Sep 17 00:00:00 2001
From: Nicolas Prevot <nprevot@google.com>
Date: Mon, 2 Jun 2014 15:20:42 +0100
Subject: [PATCH] Small fix related to cross-profile result intents.

Change-Id: Id99d6406cdd8ceddacf6fee0cf66e7e59d749a15
---
 services/core/java/com/android/server/am/ActivityStack.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 16ad1533645e9..ba12374acef49 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -2537,7 +2537,9 @@ final class ActivityStack {
                     + " who=" + r.resultWho + " req=" + r.requestCode
                     + " res=" + resultCode + " data=" + resultData);
             if (resultTo.userId != r.userId) {
-                resultData.prepareToLeaveUser(r.userId);
+                if (resultData != null) {
+                    resultData.prepareToLeaveUser(r.userId);
+                }
             }
             if (r.info.applicationInfo.uid > 0) {
                 mService.grantUriPermissionFromIntentLocked(r.info.applicationInfo.uid,