commit 3c2d44c3ffe3bb98af154911b7ae31f6cec99a83
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 07 20:40:21 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 07 20:40:21 2024 +0000
tree f55b2927e1008b96d2e88e2c09a10f8054a43b0f
parent 2c3fbda0549962102903e9a91330c1bde55d6f92
parent 28f83ffab00554263e3b9bbc61e9e2f2ca85ed9c

Merge "Fixes for errorprone update" into main am: 28f83ffab0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3297590

Change-Id: If54aa111229245173d625b445cf9e1f10182196d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java

diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index 69f1886..1cf365e 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -120,7 +120,6 @@
         assertThat(fakeSlice.getSummary()).isEqualTo(FAKE_SUMMARY);
         assertThat(fakeSlice.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
         assertThat(fakeSlice.getKeywords()).isNull();
-        assertThat(fakeSlice.getIconResource()).isNotNull();
         assertThat(fakeSlice.getUri().toString())
                 .isEqualTo("content://com.android.settings.slices/action/key");
         assertThat(fakeSlice.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_CLASSNAME);