commit 95085d154b1ea6b4db3ae14d39a1c8c8a6560f78
author Doris Liu <tianliu@google.com> Thu Feb 04 20:03:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 04 20:03:44 2016 +0000
tree 45331b20d9ed22f531f46d9600cb86a9a1ddb79c
parent 3db779646151123073db918869125bd66135fcbb
parent 3aaff80f3232aa4d7aba826a5ad9edd95bc45c65

Merge "Revert "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 21ed7dd..0a3e27e 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 group, path or vector. " +
-                        target == null ? "Null target" : target.getClass() + " is not supported");
+                throw new UnsupportedOperationException("Target should be either VGroup, VPath, " +
+                        "or ConstantState, " + target.getClass() + " is not supported");
             }
         }