Fix ANRs due to waiting for IO on UI thread
Bug: 7998915
Change-Id: I938145a7072170f713099a04578f98951b35cbab
diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index 28fd71e..497632f 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -132,7 +132,6 @@
private void stopTaskAndDismissDialog() {
if (mTask != null) {
if (!mWaitOnStop) mTask.cancel();
- mTask.waitDone();
if (mDialog != null && mDialog.isShowing()) mDialog.dismiss();
mDialog = null;
mTask = null;
@@ -334,15 +333,26 @@
stopTaskAndDismissDialog();
Activity activity = mActivity;
- mDialog = createProgressDialog(activity, title, ids.size());
if (showDialog) {
+ mDialog = createProgressDialog(activity, title, ids.size());
mDialog.show();
+ } else {
+ mDialog = null;
}
MediaOperation operation = new MediaOperation(action, ids, listener);
mTask = mActivity.getBatchServiceThreadPoolIfAvailable().submit(operation, null);
mWaitOnStop = waitOnStop;
}
+ public void startSingleItemAction(int action, Path targetPath) {
+ ArrayList<Path> ids = new ArrayList<Path>(1);
+ ids.add(targetPath);
+ mDialog = null;
+ MediaOperation operation = new MediaOperation(action, ids, null);
+ mTask = mActivity.getBatchServiceThreadPoolIfAvailable().submit(operation, null);
+ mWaitOnStop = false;
+ }
+
public static String getMimeType(int type) {
switch (type) {
case MediaObject.MEDIA_TYPE_IMAGE :