commit d86da085317e7e4e6ac99f8f8ea292a9e9f133bf
author Doris Liu <tianliu@google.com> Wed Feb 03 22:19:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 03 22:19:40 2016 +0000
tree dc903e687ca506af9731bf7dfbaceb9e4395fbe1
parent 555c86f9447e8588f5450d85295e7d0d92d775e3
parent d4fda02dd59adff9553dca5647ebb6c023145d5f

Merge "Fix NPE for invalid target exception"

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");
             }
         }