diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
index 3ba2bc6cd47b0..a74ecd3831d06 100644
--- a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
+++ b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
@@ -538,6 +538,8 @@ public class MultiWaveView extends View {
             maxWidth = Math.max(maxWidth, target.getWidth());
             maxHeight = Math.max(maxHeight, target.getHeight());
         }
+        mTargetResourceId = resourceId;
+        mTargetDrawables = targetDrawables;
         if (mMaxTargetWidth != maxWidth || mMaxTargetHeight != maxHeight) {
             mMaxTargetWidth = maxWidth;
             mMaxTargetHeight = maxHeight;
@@ -546,8 +548,6 @@ public class MultiWaveView extends View {
             updateTargetPositions();
         }
         array.recycle();
-        mTargetResourceId = resourceId;
-        mTargetDrawables = targetDrawables;
     }
 
     /**