Merge "Revert "Fix NPE for invalid target exception""

2016-02-04 20:03:44 +00:00
parent 3db7796461 3aaff80f32
commit 95085d154b
1 changed files with 2 additions and 2 deletions
--- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
@@ -852,8 +852,8 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 {
                        (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");
            }
        }