diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index e79852bf7ef..72bfa1123c6 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -1013,7 +1013,8 @@ public final class Utils extends com.android.settingslib.Utils { Drawable safeIcon = icon; if ((icon != null) && !(icon instanceof VectorDrawable)) { - safeIcon = getSafeDrawable(icon, 500, 500); + safeIcon = getSafeDrawable(icon, + /* MAX_DRAWABLE_SIZE */ 600, /* MAX_DRAWABLE_SIZE */ 600); } return safeIcon; diff --git a/src/com/android/settings/accessibility/AccessibilityFooterPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityFooterPreferenceController.java index 08e5906105e..c22b11e725a 100644 --- a/src/com/android/settings/accessibility/AccessibilityFooterPreferenceController.java +++ b/src/com/android/settings/accessibility/AccessibilityFooterPreferenceController.java @@ -104,11 +104,17 @@ public class AccessibilityFooterPreferenceController extends BasePreferenceContr sb.append(getIntroductionTitle()).append("\n\n").append(footerPreference.getTitle()); footerPreference.setContentDescription(sb); + final Intent helpIntent; if (getHelpResource() != 0) { + // Returns may be null if content is wrong or empty. + helpIntent = HelpUtils.getHelpIntent(mContext, mContext.getString(getHelpResource()), + mContext.getClass().getName()); + } else { + helpIntent = null; + } + + if (helpIntent != null) { footerPreference.setLearnMoreAction(view -> { - final Intent helpIntent = HelpUtils.getHelpIntent( - mContext, mContext.getString(getHelpResource()), - mContext.getClass().getName()); view.startActivityForResult(helpIntent, 0); }); footerPreference.setLearnMoreContentDescription(getLearnMoreContentDescription()); diff --git a/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java b/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java index 861ff276d7a..2da81641c7d 100644 --- a/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java +++ b/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java @@ -86,4 +86,9 @@ public class BiometricSettingsAppPreferenceController extends TogglePreferenceCo return AVAILABLE_UNSEARCHABLE; } } + + @Override + public final boolean isSliceable() { + return false; + } } diff --git a/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java b/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java index 6fe651f74cc..f6f2d5f2b57 100644 --- a/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java +++ b/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java @@ -68,4 +68,9 @@ public class BiometricSettingsKeyguardPreferenceController extends TogglePrefere } return getRestrictingAdmin() != null ? DISABLED_FOR_USER : AVAILABLE; } + + @Override + public final boolean isSliceable() { + return false; + } } diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index 140a3fc469e..62347ac8ced 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -44,7 +44,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; @@ -290,7 +289,7 @@ public class FaceSettings extends DashboardFragment { if (!isFaceHardwareDetected(context)) { return null; } - mControllers = buildPreferenceControllers(context, getSettingsLifecycle()); + mControllers = buildPreferenceControllers(context); // There's no great way of doing this right now :/ for (AbstractPreferenceController controller : mControllers) { if (controller instanceof FaceSettingsAttentionPreferenceController) { @@ -309,8 +308,7 @@ public class FaceSettings extends DashboardFragment { return mControllers; } - private static List buildPreferenceControllers(Context context, - Lifecycle lifecycle) { + private static List buildPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); controllers.add(new FaceSettingsKeyguardPreferenceController(context)); controllers.add(new FaceSettingsAppPreferenceController(context)); @@ -328,7 +326,7 @@ public class FaceSettings extends DashboardFragment { public List createPreferenceControllers( Context context) { if (isFaceHardwareDetected(context)) { - return buildPreferenceControllers(context, null /* lifecycle */); + return buildPreferenceControllers(context); } else { return null; } diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java index 0eb823bc4d9..82fa00b864e 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java @@ -116,11 +116,6 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe return true; } - @Override - public boolean isSliceable() { - return false; - } - @Override public int getAvailabilityStatus() { return AVAILABLE; diff --git a/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java index 3149c353ada..36984a28958 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java @@ -46,4 +46,9 @@ public abstract class FaceSettingsPreferenceController extends TogglePreferenceC return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled( mContext, DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId); } + + @Override + public final boolean isSliceable() { + return false; + } } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java index fa929514173..0fc8670402f 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java @@ -31,12 +31,18 @@ import com.android.settings.biometrics.BiometricErrorDialog; */ public class FingerprintErrorDialog extends BiometricErrorDialog { public static void showErrorDialog(BiometricEnrollBase host, int errMsgId) { + if (host.isFinishing()) { + return; + } + + final FragmentManager fragmentManager = host.getSupportFragmentManager(); + if (fragmentManager.isDestroyed()) { + return; + } + final CharSequence errMsg = host.getText(getErrorMessage(errMsgId)); final FingerprintErrorDialog dialog = newInstance(errMsg, errMsgId); - final FragmentManager fragmentManager = host.getSupportFragmentManager(); - if (!fragmentManager.isDestroyed()) { - dialog.show(fragmentManager, FingerprintErrorDialog.class.getName()); - } + dialog.show(fragmentManager, FingerprintErrorDialog.class.getName()); } private static int getErrorMessage(int errMsgId) { diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java index 5851b506e4e..b60f1b64c38 100644 --- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java @@ -103,8 +103,10 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont new BluetoothAdapter.OnMetadataChangedListener() { @Override public void onMetadataChanged(BluetoothDevice device, int key, byte[] value) { - Log.i(TAG, String.format("Metadata updated in Device %s: %d = %s.", device, key, - value == null ? null : new String(value))); + if (DEBUG) { + Log.d(TAG, String.format("Metadata updated in Device %s: %d = %s.", device, + key, value == null ? null : new String(value))); + } refresh(); } }; diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java index 8e9e946820c..36c55e2805e 100644 --- a/src/com/android/settings/network/SubscriptionsPreferenceController.java +++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java @@ -311,7 +311,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl numLevels += 1; } - Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, false); + Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, + !mTelephonyManager.isDataEnabled()); final boolean isActiveCellularNetwork = mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext); if (isActiveCellularNetwork || (mWifiPickerTrackerHelper != null) diff --git a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java index 482865c40ab..d89163d0c1b 100644 --- a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java @@ -54,10 +54,13 @@ public class ZenModePrioritySendersPreferenceController @VisibleForTesting static final String KEY_NONE = "senders_none"; private static final Intent ALL_CONTACTS_INTENT = - new Intent(Contacts.Intents.UI.LIST_DEFAULT); + new Intent(Contacts.Intents.UI.LIST_DEFAULT) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); private static final Intent STARRED_CONTACTS_INTENT = - new Intent(Contacts.Intents.UI.LIST_STARRED_ACTION); - private static final Intent FALLBACK_INTENT = new Intent(Intent.ACTION_MAIN); + new Intent(Contacts.Intents.UI.LIST_STARRED_ACTION) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + private static final Intent FALLBACK_INTENT = new Intent(Intent.ACTION_MAIN) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); private final PackageManager mPackageManager; private final boolean mIsMessages; // if this is false, then this preference is for calls diff --git a/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceController.java index a6de68c2546..3ac66337eb4 100644 --- a/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceController.java @@ -43,10 +43,12 @@ public class ZenRuleStarredContactsPreferenceController extends mPriorityCategory = priorityCategory; mPackageManager = mContext.getPackageManager(); - mStarredContactsIntent = new Intent(Contacts.Intents.UI.LIST_STARRED_ACTION); + mStarredContactsIntent = new Intent(Contacts.Intents.UI.LIST_STARRED_ACTION) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); mFallbackIntent = new Intent(Intent.ACTION_MAIN); mFallbackIntent.addCategory(Intent.CATEGORY_APP_CONTACTS); + mFallbackIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); } @Override diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java index d6c8d996a16..cc8520b9745 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java @@ -109,16 +109,16 @@ public class AccessibilityFooterPreferenceControllerTest { } @Test - public void onBindViewHolder_setupHelpLink_setCorrectHelpLinkAndContentDescription() { - mController.setupHelpLink(TEST_HELP_ID, TEST_CONTENT_DESCRIPTION); + public void onBindViewHolder_setHelpResource_emptyString_notVisible() { + mController.setupHelpLink(R.string.help_url_timeout, TEST_CONTENT_DESCRIPTION); mController.displayPreference(mScreen); mPreference.onBindViewHolder(mPreferenceViewHolder); final TextView learnMoreView = (TextView) mPreferenceViewHolder .findViewById(com.android.settingslib.R.id.settingslib_learn_more); - assertThat(learnMoreView.getContentDescription().toString()) - .contains(TEST_CONTENT_DESCRIPTION); - assertThat(mPreference.isLinkEnabled()).isTrue(); + assertThat(learnMoreView.getContentDescription()).isNull(); + assertThat(learnMoreView.getVisibility()).isEqualTo(View.GONE); + assertThat(mPreference.isLinkEnabled()).isFalse(); } } diff --git a/tests/unit/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceControllerTest.java new file mode 100644 index 00000000000..f66e65f6c5b --- /dev/null +++ b/tests/unit/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceControllerTest.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.biometrics.combination; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class BiometricSettingsAppPreferenceControllerTest { + + private Context mContext; + private BiometricSettingsAppPreferenceController mController; + + @Before + public void setUp() { + mContext = ApplicationProvider.getApplicationContext(); + mController = new BiometricSettingsAppPreferenceController(mContext, "key"); + } + + @Test + public void isSliceable_returnFalse() { + assertThat(mController.isSliceable()).isFalse(); + } +} diff --git a/tests/unit/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceControllerTest.java new file mode 100644 index 00000000000..400b4fe70e9 --- /dev/null +++ b/tests/unit/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceControllerTest.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.biometrics.combination; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class BiometricSettingsKeyguardPreferenceControllerTest { + + private Context mContext; + private BiometricSettingsKeyguardPreferenceController mController; + + @Before + public void setUp() { + mContext = ApplicationProvider.getApplicationContext(); + mController = new BiometricSettingsKeyguardPreferenceController(mContext, "key"); + } + + @Test + public void isSliceable_returnFalse() { + assertThat(mController.isSliceable()).isFalse(); + } +} diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceControllerTest.java new file mode 100644 index 00000000000..af45a68d7d1 --- /dev/null +++ b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceControllerTest.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.biometrics.face; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class FaceSettingsAppPreferenceControllerTest { + + private Context mContext; + private FaceSettingsAppPreferenceController mController; + + @Before + public void setUp() { + mContext = ApplicationProvider.getApplicationContext(); + mController = new FaceSettingsAppPreferenceController(mContext); + } + + @Test + public void isSliceable_returnFalse() { + assertThat(mController.isSliceable()).isFalse(); + } +} diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceControllerTest.java new file mode 100644 index 00000000000..678295943e7 --- /dev/null +++ b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceControllerTest.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.biometrics.face; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class FaceSettingsConfirmPreferenceControllerTest { + + private Context mContext; + private FaceSettingsConfirmPreferenceController mController; + + @Before + public void setUp() { + mContext = ApplicationProvider.getApplicationContext(); + mController = new FaceSettingsConfirmPreferenceController(mContext); + } + + @Test + public void isSliceable_returnFalse() { + assertThat(mController.isSliceable()).isFalse(); + } +} diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceControllerTest.java new file mode 100644 index 00000000000..ee62ed7ba34 --- /dev/null +++ b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceControllerTest.java @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.biometrics.face; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class FaceSettingsKeyguardPreferenceControllerTest { + private Context mContext; + private FaceSettingsKeyguardPreferenceController mController; + + @Before + public void setUp() { + mContext = ApplicationProvider.getApplicationContext(); + mController = new FaceSettingsKeyguardPreferenceController(mContext); + } + + @Test + public void isSliceable_returnFalse() { + assertThat(mController.isSliceable()).isFalse(); + } +} diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java index cb78d19714c..7cffb76f983 100644 --- a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java @@ -665,6 +665,7 @@ public class SubscriptionsPreferenceControllerTest { doReturn(true).when(sInjector).isProviderModelEnabled(mContext); doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); Drawable icon = mock(Drawable.class); + when(mTelephonyManager.isDataEnabled()).thenReturn(true); doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false)); setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true, true, ServiceState.STATE_IN_SERVICE); @@ -683,6 +684,7 @@ public class SubscriptionsPreferenceControllerTest { doReturn(true).when(sInjector).isProviderModelEnabled(mContext); doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); Drawable icon = mock(Drawable.class); + when(mTelephonyManager.isDataEnabled()).thenReturn(true); doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false)); setupGetIconConditions(subId, false, true, true, ServiceState.STATE_IN_SERVICE); @@ -701,7 +703,8 @@ public class SubscriptionsPreferenceControllerTest { doReturn(true).when(sInjector).isProviderModelEnabled(mContext); doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); Drawable icon = mock(Drawable.class); - doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false)); + when(mTelephonyManager.isDataEnabled()).thenReturn(false); + doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(true)); setupGetIconConditions(subId, false, false, false, ServiceState.STATE_IN_SERVICE);