Commit 1418da53 authored May 05, 2015 by George Mount Committed by Android Git Automerger May 05, 2015

am fa8cd17a: am c441dca2: am 57436d3f: Merge "Fix potential NPE in internal...

am fa8cd17a: am c441dca2: am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev

* commit 'fa8cd17a':
  Fix potential NPE in internal isValidTarget method.

parents 5e60b79e fa8cd17a

core/java/android/transition/Transition.java

+3 −0

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