Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e70a61d5 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Nandana Dutt
Browse files

Warn about sensitive bugreport contents. 

We show this message when clicking a notification, but we also want
to alert users when they're picking files to attach/share.

Bug: 114711671
Test: manual
Change-Id: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5
Merged-In: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5
(cherry picked from commit 59137825)
parent 6ef0182f

packages/Shell/src/com/android/shell/BugreportStorageProvider.java

+13 −0
Original line number Diff line number Diff line
@@ -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 {