commit 8931da12e85c181652a8e47fb358a5bdfc79a1fd
author Dianne Hackborn <hackbod@google.com> Thu Mar 08 19:27:21 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 08 19:27:21 2012 -0800
tree 1262e4531b02830bee6f2999b7beea08bae3bc75
parent 8ac70c42507560bf6df7114e96f788c03a18bd6a
parent d9781fe7ee88ea324e5e688dd9c352ab54fd179a

Merge "Fix crash."

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 2538455..fd968e0 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4934,7 +4934,7 @@
     void grantUriPermissionFromIntentLocked(int callingUid,
             String targetPkg, Intent intent, UriPermissionOwner owner) {
         NeededUriGrants needed = checkGrantUriPermissionFromIntentLocked(callingUid, targetPkg,
-                intent, intent.getFlags(), null);
+                intent, intent != null ? intent.getFlags() : 0, null);
         if (needed == null) {
             return;
         }