Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev

Browse Source 
* commit '82fd842827fcdb3570d0c606bd049f42bf2b3fba':
  Protect against ImageView changing to a null Drawable during Transition.
This commit is contained in:
George Mount
2014-10-23 21:52:13 +00:00
committed by Android Git Automerger
parent f3ab441090 82fd842827
commit 039cc06049
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/ImageView.java
View File

@@ -1120,6 +1120,9 @@ public class ImageView extends View {
/** @hide */ /** @hide */
public void animateTransform(Matrix matrix) { public void animateTransform(Matrix matrix) {
if (mDrawable == null) {
return;
}
if (matrix == null) { if (matrix == null) {
mDrawable.setBounds(0, 0, getWidth(), getHeight()); mDrawable.setBounds(0, 0, getWidth(), getHeight());
} else { } else {