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

Commit 35ad6bd6 authored by Tony Huang's avatar Tony Huang
Browse files

Update all loader to androidx version loader 

Due to aosp/810773 megerd, it can fully update to androix loader.

Bug: 111921428
Test: atest DocumentsUITests
Change-Id: I9cd44790717f97db154b315797de261ff8d91c7d
parent 402ad099

src/com/android/documentsui/AbstractActionHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ import static com.android.documentsui.base.DocumentInfo.getCursorInt; 
import static com.android.documentsui.base.DocumentInfo.getCursorString;

import static com.android.documentsui.base.SharedMinimal.DEBUG;



import android.app.LoaderManager.LoaderCallbacks;

import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.content.IntentSender;

import android.content.Loader;

import android.content.pm.ResolveInfo;

import android.database.Cursor;

import android.graphics.drawable.ColorDrawable;
@@ -39,6 +37,8 @@ import android.view.DragEvent; 


import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.FragmentActivity;

import androidx.loader.app.LoaderManager.LoaderCallbacks;

import androidx.loader.content.Loader;

import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;

import androidx.recyclerview.selection.MutableSelection;

import androidx.recyclerview.selection.SelectionTracker;
@@ -500,7 +500,7 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA 
            return;

        }



        mActivity.getLoaderManager().restartLoader(LOADER_ID, null, mBindings);

        mActivity.getSupportLoaderManager().restartLoader(LOADER_ID, null, mBindings);

    }



    protected final boolean launchToDocument(Uri uri) {

src/com/android/documentsui/DirectoryLoader.java

+10 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.documentsui; 


import static com.android.documentsui.base.SharedMinimal.VERBOSE;



import android.content.AsyncTaskLoader;

import android.content.ContentProviderClient;

import android.content.ContentResolver;

import android.content.Context;
@@ -47,6 +46,10 @@ import com.android.documentsui.sorting.SortModel; 


import android.os.FileUtils;



import androidx.loader.content.AsyncTaskLoader;



import java.util.concurrent.Executor;



public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {



    private static final String TAG = "DirectoryLoader";
@@ -77,7 +80,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
            ContentLock lock,

            boolean inSearchMode) {



        super(context, ProviderExecutor.forAuthority(root.authority));

        super(context);

        mFeatures = features;

        mRoot = root;

        mUri = uri;
@@ -88,6 +91,11 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
        mObserver = new LockingContentObserver(lock, this::onContentChanged);

    }



    @Override

    protected Executor getExecutor() {

        return ProviderExecutor.forAuthority(mRoot.authority);

    }



    @Override

    public final DirectoryResult loadInBackground() {

        synchronized (this) {

src/com/android/documentsui/RecentsLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.documentsui.base.SharedMinimal.DEBUG; 
import static com.android.documentsui.base.SharedMinimal.TAG;



import android.app.ActivityManager;

import android.content.AsyncTaskLoader;

import android.content.ContentProviderClient;

import android.content.Context;

import android.database.Cursor;
@@ -42,6 +41,7 @@ import com.android.documentsui.base.State; 
import com.android.documentsui.roots.ProvidersAccess;

import com.android.documentsui.roots.RootCursorWrapper;

import androidx.annotation.GuardedBy;

import androidx.loader.content.AsyncTaskLoader;



import com.google.common.util.concurrent.AbstractFuture;

tests/unit/com/android/documentsui/AbstractActionHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class AbstractActionHandlerTest { 
        mHandler.loadDocumentsForCurrentStack();

        CountDownLatch latch = new CountDownLatch(1);

        mEnv.model.addUpdateListener(event -> latch.countDown());

        mActivity.loaderManager.runAsyncTaskLoader(AbstractActionHandler.LOADER_ID);

        mActivity.supportLoaderManager.runAsyncTaskLoader(AbstractActionHandler.LOADER_ID);



        latch.await(1, TimeUnit.SECONDS);

        assertEquals(2, mEnv.model.getItemCount());