commit d4fda02dd59adff9553dca5647ebb6c023145d5f
author Doris Liu <tianliu@google.com> Wed Feb 03 11:10:49 2016 -0800
committer Doris Liu <tianliu@google.com> Wed Feb 03 11:10:49 2016 -0800
tree 2d68103eaa023883d050af025bb28a5d9cf91818
parent 0eef10e5566b29b681ddb3510398dc7cc298391f

Fix NPE for invalid target exception

Change-Id: I57b319fae617792351c6ec9872c3b73cd25dc4e5

graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java

diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
index 0a3e27e..21ed7dd 100644
--- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
@@ -852,8 +852,8 @@
                         (VectorDrawable.VectorDrawableState) target, startTime);
             } else {
                 // Should never get here
-                throw new UnsupportedOperationException("Target should be either VGroup, VPath, " +
-                        "or ConstantState, " + target.getClass() + " is not supported");
+                throw new UnsupportedOperationException("Target should be group, path or vector. " +
+                        target == null ? "Null target" : target.getClass() + " is not supported");
             }
         }