am 7312c89a: Merge "Ensure screenshots saved through DDMS end with .png."

* commit '7312c89ade9495d42132ec7fdf7db8142da5fa8a':
  Ensure screenshots saved through DDMS end with .png.

1 files changed, 4 insertions, 0 deletions

diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/ScreenShotDialog.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/ScreenShotDialog.java
index d0c8a2f..b0f885a 100644
--- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/ScreenShotDialog.java
+++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/ScreenShotDialog.java
@@ -321,6 +321,10 @@ public class ScreenShotDialog extends Dialog {
             // the value the dialog was initialized with. It does however return
             // the full path as its return value, so just pick the path from
             // there.
+            if (!fileName.endsWith(".png")) {
+                fileName = fileName + ".png";
+            }
+
             String saveDir = new File(fileName).getParent();
             if (saveDir != null) {
                 DdmUiPreferences.getStore().setValue("lastImageSaveDir", saveDir);