From 21fb21db709d8010fbf96882acfd28aa8c8aee51 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Mon, 29 Mar 2021 12:24:44 -0400
Subject: [PATCH] Address difference in icon id with provider model

Fixes test, providing an actual resource id if using the provider model.

Test: atest QSCarrierTest with and without flag set
Fixes: 183927021
Change-Id: Ia3b6ba01589fb680f658b9298ad374327591091d
---
 .../systemui/qs/carrier/QSCarrierTest.java     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java
index 022dc847130d4..104b6250b62fb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java
@@ -21,10 +21,13 @@ import static org.junit.Assert.assertTrue;
 
 import android.testing.AndroidTestingRunner;
 import android.testing.TestableLooper;
+import android.util.FeatureFlagUtils;
 import android.view.LayoutInflater;
 
 import androidx.test.filters.SmallTest;
 
+import com.android.settingslib.graph.SignalDrawable;
+import com.android.settingslib.mobile.TelephonyIcons;
 import com.android.systemui.R;
 import com.android.systemui.SysuiTestCase;
 
@@ -39,6 +42,7 @@ public class QSCarrierTest extends SysuiTestCase {
 
     private QSCarrier mQSCarrier;
     private TestableLooper mTestableLooper;
+    private int mSignalIconId;
 
     @Before
     public void setUp() throws Exception {
@@ -46,18 +50,26 @@ public class QSCarrierTest extends SysuiTestCase {
         LayoutInflater inflater = LayoutInflater.from(mContext);
         mTestableLooper.runWithLooper(() ->
                 mQSCarrier = (QSCarrier) inflater.inflate(R.layout.qs_carrier, null));
+
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+            // In this case, the id is an actual drawable id
+            mSignalIconId = TelephonyIcons.MOBILE_CALL_STRENGTH_ICONS[0];
+        } else {
+            // In this case, the id is a level
+            mSignalIconId = SignalDrawable.getEmptyState(5);
+        }
     }
 
     @Test
     public void testUpdateState_first() {
-        CellSignalState c = new CellSignalState(true, 0, "", "", false);
+        CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false);
 
         assertTrue(mQSCarrier.updateState(c));
     }
 
     @Test
     public void testUpdateState_same() {
-        CellSignalState c = new CellSignalState(true, 0, "", "", false);
+        CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false);
 
         assertTrue(mQSCarrier.updateState(c));
         assertFalse(mQSCarrier.updateState(c));
@@ -65,7 +77,7 @@ public class QSCarrierTest extends SysuiTestCase {
 
     @Test
     public void testUpdateState_changed() {
-        CellSignalState c = new CellSignalState(true, 0, "", "", false);
+        CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false);
 
         assertTrue(mQSCarrier.updateState(c));