Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1 (f6f87c98) · Commits · e / os / android_frameworks_base

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

+10 −11

Original line number	Diff line number	Diff line
		@@ -3914,9 +3914,7 @@ 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");
		}
		@@ -3927,6 +3925,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		intents[i] = new Intent(intent);
		}
		}
		if (resolvedTypes != null && resolvedTypes.length != intents.length) {
		throw new IllegalArgumentException(
		"Intent array length does not match resolvedTypes length");