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

Commit 15be8361 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Support overriding calling package in Documents. 

Calling package is only used to pick the stack to restore, not for
security purposes.  This lets other system tools (like Printing)
indicate the real caller.

Bug: 11149540
Change-Id: I155e32577eaeda7dfcb80a7d84ac3b54f281590a
parent d2e1e810

core/java/android/provider/DocumentsContract.java

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ public final class DocumentsContract { 
     */

    public static final String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";



    /** {@hide} */

    public static final String EXTRA_PACKAGE_NAME = "android.content.extra.PACKAGE_NAME";



    /** {@hide} */

    public static final String ACTION_MANAGE_ROOT = "android.provider.action.MANAGE_ROOT";

    /** {@hide} */

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

+8 −3
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ public class DocumentsActivity extends Activity { 
        @Override

        protected Void doInBackground(Void... params) {

            // Restore last stack for calling package

            final String packageName = getCallingPackage();

            final String packageName = getCallingPackageMaybeExtra();

            final Cursor cursor = getContentResolver()

                    .query(RecentsProvider.buildResume(packageName), null, null, null, null);

            try {
@@ -783,6 +783,11 @@ public class DocumentsActivity extends Activity { 
        return mState.stack.peek();

    }



    private String getCallingPackageMaybeExtra() {

        final String extra = getIntent().getStringExtra(DocumentsContract.EXTRA_PACKAGE_NAME);

        return (extra != null) ? extra : getCallingPackage();

    }



    public Executor getCurrentExecutor() {

        final DocumentInfo cwd = getCurrentDirectory();

        if (cwd != null && cwd.authority != null) {
@@ -921,7 +926,7 @@ public class DocumentsActivity extends Activity { 
        if (requestCode == CODE_FORWARD && resultCode != RESULT_CANCELED) {



            // Remember that we last picked via external app

            final String packageName = getCallingPackage();

            final String packageName = getCallingPackageMaybeExtra();

            final ContentValues values = new ContentValues();

            values.put(ResumeColumns.EXTERNAL, 1);

            getContentResolver().insert(RecentsProvider.buildResume(packageName), values);
@@ -1002,7 +1007,7 @@ public class DocumentsActivity extends Activity { 
        }



        // Remember location for next app launch

        final String packageName = getCallingPackage();

        final String packageName = getCallingPackageMaybeExtra();

        values.clear();

        values.put(ResumeColumns.STACK, rawStack);

        values.put(ResumeColumns.EXTERNAL, 0);