PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-12 00:15:25 +00:00
committed by Android (Google) Code Review
parent 00ca556f26 07df08950a
commit 9edcca238b
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
View File

@@ -39,6 +39,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.slice.Slice; import androidx.slice.Slice;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.utils.AsyncLoaderCompat; import com.android.settingslib.utils.AsyncLoaderCompat;
@@ -94,6 +95,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
@Override @Override
public List<ContextualCard> loadInBackground() { public List<ContextualCard> loadInBackground() {
final List<ContextualCard> result = new ArrayList<>(); 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()) { try (Cursor cursor = getContextualCardsFromProvider()) {
if (cursor.getCount() > 0) { if (cursor.getCount() > 0) {
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {

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

@@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import com.android.settings.R;
import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceRegistry;
import org.junit.Before; import org.junit.Before;
@@ -132,6 +133,14 @@ public class ContextualCardLoaderTest {
assertThat(result).hasSize(2); 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) { private ContextualCard getContextualCard(String sliceUri) {
return new ContextualCard.Builder() return new ContextualCard.Builder()
.setName("test_card") .setName("test_card")