commit d9781fe7ee88ea324e5e688dd9c352ab54fd179a
author Dianne Hackborn <hackbod@google.com> Thu Mar 08 18:04:18 2012 -0800
committer Dianne Hackborn <hackbod@google.com> Thu Mar 08 18:04:18 2012 -0800
tree eaa924d7bc6e45445a2e7ce203f61c680e0926e4
parent a0b29f556519653c9749cebff4af43e68b4d59ce

Fix crash.

Change-Id: Id219351625494c54524e400055755d41f3bef868

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 ce597ad..c5e7b62 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;
         }