Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev (57436d3f) · Commits · e / os / android_frameworks_base

core/java/android/transition/Transition.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -792,6 +792,9 @@ public abstract class Transition implements Cloneable {
	* views are ignored and only the ids are used).		* views are ignored and only the ids are used).
	*/		*/
	boolean isValidTarget(View target) {		boolean isValidTarget(View target) {
			if (target == null) {
			return false;
			}
	int targetId = target.getId();		int targetId = target.getId();
	if (mTargetIdExcludes != null && mTargetIdExcludes.contains(targetId)) {		if (mTargetIdExcludes != null && mTargetIdExcludes.contains(targetId)) {
	return false;		return false;