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

Commit dae5fe21 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use DocumentInfo.userId to get content resolver."

parents 58b0688f cfb64adb

src/com/android/documentsui/CreateDirectoryFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class CreateDirectoryFragment extends DialogFragment { 


        @Override

        protected DocumentInfo doInBackground(Void... params) {

            final ContentResolver resolver = mActivity.getContentResolver();

            final ContentResolver resolver = mCwd.userId.getContentResolver(mActivity);

            ContentProviderClient client = null;

            try {

                client = DocumentsApplication.acquireUnstableProviderOrThrow(

src/com/android/documentsui/DirectoryLoader.java

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
            mSignal = new CancellationSignal();

        }



        final ContentResolver resolver = getContext().getContentResolver();

        final ContentResolver resolver = mDoc.userId.getContentResolver(getContext());

        final String authority = mUri.getAuthority();



        final DirectoryResult result = new DirectoryResult();
@@ -235,6 +235,6 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
        FileUtils.closeQuietly(mResult);

        mResult = null;



        getContext().getContentResolver().unregisterContentObserver(mObserver);

        mDoc.userId.getContentResolver(getContext()).unregisterContentObserver(mObserver);

    }

}

src/com/android/documentsui/DocumentsAccess.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public interface DocumentsAccess { 


        @Override

        public Uri createDocument(DocumentInfo parentDoc, String mimeType, String displayName) {

            final ContentResolver resolver = mContext.getContentResolver();

            final ContentResolver resolver = parentDoc.userId.getContentResolver(mContext);

            try (ContentProviderClient client = DocumentsApplication.acquireUnstableProviderOrThrow(

                        resolver, parentDoc.derivedUri.getAuthority())) {

                return DocumentsContract.createDocument(

src/com/android/documentsui/files/ActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class ActionHandler<T extends FragmentActivity & AbstractActionHandler.Co 


    @Override

    public @Nullable DocumentInfo renameDocument(String name, DocumentInfo document) {

        ContentResolver resolver = mActivity.getContentResolver();

        ContentResolver resolver = document.userId.getContentResolver(mActivity);

        ContentProviderClient client = null;



        try {

src/com/android/documentsui/inspector/InspectorController.java

+2 −1
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ public final class InspectorController { 
            if (docInfo.isMetadataSupported()) {

                mLoader.getDocumentMetadata(

                        docInfo.derivedUri,

                        docInfo.userId,

                        (Bundle bundle) -> {

                            onDocumentMetadataLoaded(docInfo, bundle);

                        });
@@ -304,7 +305,7 @@ public final class InspectorController { 
         * @param uri

         * @param callback

         */

        void getDocumentMetadata(Uri uri, Consumer<Bundle> callback);

        void getDocumentMetadata(Uri uri, UserId userId, Consumer<Bundle> callback);

    }



    /**