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

Commit 440fbac4 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

resolved conflicts for merge of 57db559d to master 

Change-Id: I645993fe69116f05e2275771b51a36402ba05472
parents 0de3e83d 88508e78

src/com/android/documentsui/DirectoryFragment.java

+18 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ import android.net.Uri; 
import android.os.AsyncTask;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.Handler;

import android.os.Looper;

import android.os.OperationCanceledException;

import android.os.Parcelable;

import android.os.SystemProperties;
@@ -151,6 +153,7 @@ public class DirectoryFragment extends Fragment { 


    private FragmentTuner mFragmentTuner;

    private DocumentClipper mClipper;

    private final Handler mHandler = new Handler(Looper.getMainLooper());



    public static void showNormal(FragmentManager fm, RootInfo root, DocumentInfo doc, int anim) {

        show(fm, TYPE_NORMAL, root, doc, null, anim);
@@ -322,6 +325,21 @@ public class DirectoryFragment extends Fragment { 


            @Override

            public void onLoadFinished(Loader<DirectoryResult> loader, DirectoryResult result) {

                if (result == null || result.exception != null) {

                    // onBackPressed does a fragment transaction, which can't be done inside

                    // onLoadFinished

                    mHandler.post(new Runnable() {

                        @Override

                        public void run() {

                            final Activity activity = getActivity();

                            if (activity != null) {

                                activity.onBackPressed();

                            }

                        }

                    });

                    return;

                }



                if (!isAdded()) return;



                mAdapter.swapResult(result);

src/com/android/documentsui/DirectoryLoader.java

+7 −0
Original line number Diff line number Diff line
@@ -31,7 +31,10 @@ import android.content.Context; 
import android.database.Cursor;

import android.net.Uri;

import android.os.CancellationSignal;

import android.os.Handler;

import android.os.Looper;

import android.os.OperationCanceledException;

import android.os.RemoteException;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.util.Log;
@@ -163,6 +166,10 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 


            cursor = client.query(

                    mUri, null, null, null, getQuerySortOrder(result.sortOrder), mSignal);

            if (cursor == null) {

                throw new RemoteException("Provider returned null");

            }



            cursor.registerContentObserver(mObserver);



            cursor = new RootCursorWrapper(mUri.getAuthority(), mRoot.rootId, cursor, -1);