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

Commit cf747156 authored by Tony Huang's avatar Tony Huang
Browse files

Fix app crash when testing 

Test cannot find ActionHandler.Addons because it seems be reduced
by ProGaurd. Remove this interface and just use CommonAddons which
is ActionHandler.Addons parent.

Fix: 144667472
Test: atest DocumentsUIGoogleTest
Change-Id: Ibd18e860477a27524880dae4904336a70d699427
parent 7a990adb

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

+4 −5
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import com.android.documentsui.clipping.ClipStore; 
import com.android.documentsui.clipping.DocumentClipper;

import com.android.documentsui.clipping.UrisSupplier;

import com.android.documentsui.dirlist.AnimationView;

import com.android.documentsui.files.ActionHandler.Addons;

import com.android.documentsui.inspector.InspectorActivity;

import com.android.documentsui.queries.SearchViewManager;

import com.android.documentsui.roots.ProvidersAccess;
@@ -83,8 +82,11 @@ import javax.annotation.Nullable; 


/**

 * Provides {@link FilesActivity} action specializations to fragments.

 * @param <T> activity which extends {@link FragmentActivity} and implements

 *              {@link AbstractActionHandler.CommonAddons}.

 */

public class ActionHandler<T extends FragmentActivity & Addons> extends AbstractActionHandler<T> {

public class ActionHandler<T extends FragmentActivity & AbstractActionHandler.CommonAddons>

        extends AbstractActionHandler<T> {



    private static final String TAG = "ManagerActionHandler";

    private static final int SHARE_FILES_COUNT_LIMIT = 100;
@@ -769,7 +771,4 @@ public class ActionHandler<T extends FragmentActivity & Addons> extends Abstract 
        }

        mActivity.startActivity(intent);

    }



    public interface Addons extends CommonAddons {

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.view.View; 
import androidx.annotation.CallSuper;

import androidx.fragment.app.FragmentManager;



import com.android.documentsui.AbstractActionHandler;

import com.android.documentsui.ActionModeController;

import com.android.documentsui.BaseActivity;

import com.android.documentsui.DocsSelectionHelper;
@@ -65,7 +66,7 @@ import java.util.List; 
/**

 * Standalone file management activity.

 */

public class FilesActivity extends BaseActivity implements ActionHandler.Addons {

public class FilesActivity extends BaseActivity implements AbstractActionHandler.CommonAddons {



    private static final String TAG = "FilesActivity";

    static final String PREFERENCES_SCOPE = "files";

tests/unit/com/android/documentsui/files/TestActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.documentsui.files;



import com.android.documentsui.files.ActionHandler;

import com.android.documentsui.AbstractActionHandler;

import com.android.documentsui.testing.TestEnv;



import org.mockito.Mockito;
@@ -33,4 +33,4 @@ public abstract class TestActivity extends AbstractBase { 
// Trick Mockito into finding our Addons methods correctly. W/o this

// hack, Mockito thinks Addons methods are not implemented.

abstract class AbstractBase extends com.android.documentsui.TestActivity

        implements ActionHandler.Addons {}
 
        implements AbstractActionHandler.CommonAddons {}