Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Escape title of Operationdialog." into nyc-dev

Browse Source 
am: 04003d8936

* commit '04003d8936684d5bdb9ccbdca4149e113c62eb38':
  Escape title of Operationdialog.
This commit is contained in:
Steve McKay
2016-02-19 02:50:57 +00:00
committed by android-build-merger
parent c7a04ac591 04003d8936
commit 92c44fc846
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/DocumentsUI/src/com/android/documentsui/OperationDialogFragment.java
View File

@@ -16,9 +16,6 @@
package com.android.documentsui;
import static com.android.documentsui.services.FileOperationService.OpType;
import static com.android.internal.util.Preconditions.checkArgument;
import android.annotation.IntDef;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -32,13 +29,11 @@ import android.text.Html;
import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.DocumentStack;
import com.android.documentsui.services.FileOperationService;
import com.android.documentsui.services.FileOperations;
import com.android.documentsui.services.Job;
import com.android.documentsui.services.FileOperationService.OpType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List;
/**
* Alert dialog for operation dialogs.
@@ -114,7 +109,7 @@ public class OperationDialogFragment extends DialogFragment {
final StringBuilder list = new StringBuilder("<p>");
for (DocumentInfo documentInfo : srcList) {
list.append(String.format("&#8226; %s<br>", documentInfo.displayName));
list.append(String.format("&#8226; %s<br>", Html.escapeHtml(documentInfo.displayName)));
}
list.append("</p>");
builder.setMessage(Html.fromHtml(String.format(messageFormat, list.toString())));