Gallery2: fix a crash when print a photo received from Bluetooth.

An IllegalArgumentException occurs because printJobName is null.

If printJobName is null, set a default print job name.

Change-Id: Ia20813f6f2e5ad4936e4db413c94b8fc4975d590
CRs-Fixed: 960251

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
index a7c54ee29..5203d3553 100644
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -74,6 +74,8 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
     };
     private IntentFilter mMountFilter = new IntentFilter(Intent.ACTION_MEDIA_MOUNTED);
 
+    private static final String DEFAULT_PRINT_JOB_NAME = "print job";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -367,6 +369,9 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
             return;
         }
         String printJobName = getLastPathSegment(uri);
+        if (printJobName == null) {
+            printJobName = DEFAULT_PRINT_JOB_NAME;
+        }
         PrintHelper printer = new PrintHelper(this);
         try {
             printer.printBitmap(printJobName, uri);
@@ -376,8 +381,8 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
     }
 
     private String getLastPathSegment(Uri uri) {
-        String path = "";
-        if (uri == null) return path;
+        if (uri == null) return null;
+        String path = null;
         try {
             path = ImageLoader.getLocalPathFromUri(this, uri);
         } catch (IllegalArgumentException e) {