Merge "Fix "Turn on phone calls" for guest user"

2022-06-09 08:46:38 +00:00
parent a2804e7123 935b735fb4
commit ab64c52f7d
10 changed files with 286 additions and 100 deletions
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -146,6 +146,8 @@ public class UserSettingsTest {
        mFragment = spy(new UserSettings());
        ReflectionHelpers.setField(mFragment, "mAddUserWhenLockedPreferenceController",
                mock(AddUserWhenLockedPreferenceController.class));
+        ReflectionHelpers.setField(mFragment, "mGuestTelephonyPreferenceController",
+                mock(GuestTelephonyPreferenceController.class));
        ReflectionHelpers.setField(mFragment, "mMultiUserTopIntroPreferenceController",
                mock(MultiUserTopIntroPreferenceController.class));
        ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);