From 1453ca6ebf6b332827ff310de8504d341ead922a Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Wed, 9 Dec 2020 16:22:50 -0800 Subject: [PATCH] Don't depend on shadow IRoleManager. Because we are moving role into module, and IRoleManager can not be an API. Bug: 158736025 Test: DefaultSmsShortcutPreferenceControllerTest Change-Id: I1af5eb6dfd35458ac7b40b049f6653cbe4be168d --- .../DefaultSmsShortcutPreferenceControllerTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java index 8626d2da3c9..691ce5e8579 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; import android.app.role.RoleControllerManager; +import android.app.role.RoleManager; import android.content.Context; import org.junit.Before; @@ -36,6 +37,8 @@ public class DefaultSmsShortcutPreferenceControllerTest { private static final String TEST_PACKAGE_NAME = "TestPackage"; private static final String PREFERENCE_KEY = "default_sms_app"; + @Mock + private RoleManager mRoleManager; @Mock private RoleControllerManager mRoleControllerManager; @@ -44,8 +47,9 @@ public class DefaultSmsShortcutPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - ShadowApplication.getInstance().setSystemService(Context.ROLE_CONTROLLER_SERVICE, - mRoleControllerManager); + final ShadowApplication shadowApplication = ShadowApplication.getInstance(); + shadowApplication.setSystemService(Context.ROLE_SERVICE, mRoleManager); + shadowApplication.setSystemService(Context.ROLE_CONTROLLER_SERVICE, mRoleControllerManager); mController = new DefaultSmsShortcutPreferenceController(RuntimeEnvironment.application, TEST_PACKAGE_NAME); }