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

Merge "Warn about sensitive bugreport contents."

Browse Source 
am: 702587e787

Change-Id: I4fa68006bf45a0514a153d4373274c12ba10f528
This commit is contained in:
Nandana Dutt
2018-10-03 03:14:48 -07:00
committed by android-build-merger
parent 09087a83fa 702587e787
commit f0f9fab3c8
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/Shell/src/com/android/shell/BugreportStorageProvider.java
View File

@@ -20,6 +20,7 @@ import android.database.Cursor;
import android.database.MatrixCursor;
import android.database.MatrixCursor.RowBuilder;
import android.net.Uri;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.FileUtils;
import android.os.ParcelFileDescriptor;
@@ -67,6 +68,18 @@ public class BugreportStorageProvider extends FileSystemProvider {
return result;
}
@Override
public Cursor queryChildDocuments(
String parentDocumentId, String[] projection, String sortOrder)
throws FileNotFoundException {
final Cursor c = super.queryChildDocuments(parentDocumentId, projection, sortOrder);
final Bundle extras = new Bundle();
extras.putCharSequence(DocumentsContract.EXTRA_INFO,
getContext().getText(R.string.bugreport_confirm));
c.setExtras(extras);
return c;
}
@Override
public Cursor queryDocument(String documentId, String[] projection)
throws FileNotFoundException {