40209: Fix NPE in ddms screenshot task

Change-Id: I9c95513c86050d4c4a8f8525c2a229a68b953cb8

1 files changed, 5 insertions, 3 deletions

diff --git a/ddms/ddmuilib/src/main/java/com/android/ddmuilib/ScreenShotDialog.java b/ddms/ddmuilib/src/main/java/com/android/ddmuilib/ScreenShotDialog.java
index b0f885a..c3b751a 100644
--- a/ddms/ddmuilib/src/main/java/com/android/ddmuilib/ScreenShotDialog.java
+++ b/ddms/ddmuilib/src/main/java/com/android/ddmuilib/ScreenShotDialog.java
@@ -125,10 +125,12 @@ public class ScreenShotDialog extends Dialog {
                 // so to preserve the current rotation we must call getRotated()
                 // the same number of times the user has done it manually.
                 // TODO: improve the RawImage class.
-                for (int i=0; i < mRotateCount; i++) {
-                    mRawImage = mRawImage.getRotated();
+                if (mRawImage != null) {
+                    for (int i = 0; i < mRotateCount; i++) {
+                        mRawImage = mRawImage.getRotated();
+                    }
+                    updateImageDisplay(shell);
                 }
-                updateImageDisplay(shell);
             }
         });