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

Commit 07df0895 authored by Fan Zhang's avatar Fan Zhang
Browse files

Don't load anything from contextual card db in legacy mode. 

Change-Id: I2fa1ee78bb8878c2cf46fd2f59499c9ed8eb0a09
Fixes: 124246284
Test: robotest
parent 7946eee8

src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.VisibleForTesting;

import androidx.slice.Slice;



import com.android.settings.R;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.utils.AsyncLoaderCompat;
@@ -94,6 +95,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 
    @Override

    public List<ContextualCard> loadInBackground() {

        final List<ContextualCard> result = new ArrayList<>();

        if (mContext.getResources().getBoolean(R.bool.config_use_legacy_suggestion)) {

            Log.d(TAG, "Skipping - in legacy suggestion mode");

            return result;

        }

        try (Cursor cursor = getContextualCardsFromProvider()) {

            if (cursor.getCount() > 0) {

                for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {

tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy; 
import android.content.Context;

import android.net.Uri;



import com.android.settings.R;

import com.android.settings.slices.CustomSliceRegistry;



import org.junit.Before;
@@ -132,6 +133,14 @@ public class ContextualCardLoaderTest { 
        assertThat(result).hasSize(2);

    }



    @Test

    public void loadInBackground_legacyMode_shouldReturnNothing() {

        assertThat(mContext.getResources().getBoolean(R.bool.config_use_legacy_suggestion))

                .isTrue();



        assertThat(mContextualCardLoader.loadInBackground()).isEmpty();

    }



    private ContextualCard getContextualCard(String sliceUri) {

        return new ContextualCard.Builder()

                .setName("test_card")