am 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish... (fa32cd15) · Commits · e / os / android_frameworks_base

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

+10 −11

Original line number	Original line	Diff line number	Diff line
	@@ -3892,9 +3892,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}
	for (int i=0; i<intents.length; i++) {		for (int i=0; i<intents.length; i++) {
	Intent intent = intents[i];		Intent intent = intents[i];
	if (intent == null) {		if (intent != null) {
	throw new IllegalArgumentException("Null intent at index " + i);
	}
	if (intent.hasFileDescriptors()) {		if (intent.hasFileDescriptors()) {
	throw new IllegalArgumentException("File descriptors passed in Intent");		throw new IllegalArgumentException("File descriptors passed in Intent");
	}		}
	@@ -3905,6 +3903,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}
	intents[i] = new Intent(intent);		intents[i] = new Intent(intent);
	}		}
			}
	if (resolvedTypes != null && resolvedTypes.length != intents.length) {		if (resolvedTypes != null && resolvedTypes.length != intents.length) {
	throw new IllegalArgumentException(		throw new IllegalArgumentException(
	"Intent array length does not match resolvedTypes length");		"Intent array length does not match resolvedTypes length");