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

* commit 'fa8cd17a4064f8293b4bbae379769d6e63e0ac4b':
  Fix potential NPE in internal isValidTarget method.
This commit is contained in:
George Mount
2015-05-05 01:36:57 +00:00
committed by Android Git Automerger

View File

@@ -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;