diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-04-14 15:10:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-14 15:10:31 -0700 |
| commit | f6f87c985989603139b31df663f9f9a90543cacc (patch) | |
| tree | 4861164936215fc7fcc955e6fdc0356ce27dcee4 | |
| parent | 4e3d6aa0688f023dfe5feb2eb197207cc8267463 (diff) | |
| parent | 52b0ce0fe3e9ab52c272dde3d9c59376c276a17e (diff) | |
| download | frameworks_base-f6f87c985989603139b31df663f9f9a90543cacc.zip frameworks_base-f6f87c985989603139b31df663f9f9a90543cacc.tar.gz frameworks_base-f6f87c985989603139b31df663f9f9a90543cacc.tar.bz2 | |
Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 267c76a..54cc885 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -3914,18 +3914,17 @@ public final class ActivityManagerService extends ActivityManagerNative } for (int i=0; i<intents.length; i++) { Intent intent = intents[i]; - if (intent == null) { - throw new IllegalArgumentException("Null intent at index " + i); - } - if (intent.hasFileDescriptors()) { - throw new IllegalArgumentException("File descriptors passed in Intent"); - } - if (type == INTENT_SENDER_BROADCAST && - (intent.getFlags()&Intent.FLAG_RECEIVER_BOOT_UPGRADE) != 0) { - throw new IllegalArgumentException( - "Can't use FLAG_RECEIVER_BOOT_UPGRADE here"); + if (intent != null) { + if (intent.hasFileDescriptors()) { + throw new IllegalArgumentException("File descriptors passed in Intent"); + } + if (type == INTENT_SENDER_BROADCAST && + (intent.getFlags()&Intent.FLAG_RECEIVER_BOOT_UPGRADE) != 0) { + throw new IllegalArgumentException( + "Can't use FLAG_RECEIVER_BOOT_UPGRADE here"); + } + intents[i] = new Intent(intent); } - intents[i] = new Intent(intent); } if (resolvedTypes != null && resolvedTypes.length != intents.length) { throw new IllegalArgumentException( |