Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

Browse Source
This commit is contained in:
Dianne Hackborn
2011-04-14 15:10:31 -07:00
committed by Android (Google) Code Review
parent 4e3d6aa068 52b0ce0fe3
commit f6f87c9859
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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 != 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);
}
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);
}
if (resolvedTypes != null && resolvedTypes.length != intents.length) {
throw new IllegalArgumentException(