diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-04-14 15:40:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-14 15:40:00 -0700 |
| commit | 07a630d23ef326f820e6339b5f691df0aafd3574 (patch) | |
| tree | 5382b9b1cda9bf5a3438dbd3ca3ad7772a70553b /services | |
| parent | 1bfb2db93514f8ed70d0a02c12d7ce4791d6b336 (diff) | |
| parent | 9a03a73a44c69706fe2b97a28632928f58b434b1 (diff) | |
| download | frameworks_base-07a630d23ef326f820e6339b5f691df0aafd3574.zip frameworks_base-07a630d23ef326f820e6339b5f691df0aafd3574.tar.gz frameworks_base-07a630d23ef326f820e6339b5f691df0aafd3574.tar.bz2 | |
am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
* commit '9a03a73a44c69706fe2b97a28632928f58b434b1':
Fix issue #4291805: Tap Fish crashes on launch
Diffstat (limited to 'services')
| -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 50fffd0..4f7b010 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( |