PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong user in personal profile

Browse Source 
If the user is profile, it should use the current
user's profile parent to create the context instead
of always using the primary user(system user).

Bug: 264867495
Test: Manual test with work profile enabled, multi user flow, etc
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableVirtualKeyboardFragmentTest
Change-Id: I66d1462441359c40dda2a38c7534500791db9c83
This commit is contained in:
Wilson Wu
2023-03-28 20:51:46 +08:00
parent 6dfcad2cb2
commit a7620427b5
2 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/robotests/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragmentTest.java
View File

@@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -34,6 +35,7 @@ import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
@@ -46,7 +48,6 @@ import com.android.settings.R;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.inputmethod.InputMethodPreference;
import com.android.settingslib.inputmethod.InputMethodSettingValuesWrapper;
@@ -66,14 +67,15 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
ShadowSecureSettings.class,
ShadowInputMethodManagerWithMethodList.class,
ShadowUserManager.class
ShadowInputMethodManagerWithMethodList.class
})
public class AvailableVirtualKeyboardFragmentTest {
@Mock
private InputMethodManager mInputMethodManager;
@Mock
private UserManager mUserManager;
@Mock
private InputMethodSettingValuesWrapper mValuesWrapper;
@Mock
private PreferenceScreen mPreferenceScreen;
@@ -92,6 +94,27 @@ public class AvailableVirtualKeyboardFragmentTest {
initMock();
}
@Test
public void onAttachPersonalProfile_noProfileParent() {
doReturn(null).when(mUserManager).getProfileParent(any(UserHandle.class));
mFragment.onAttach(mContext);
assertThat(mFragment.mUserAwareContext).isEqualTo(mContext);
}
@Test
public void onAttachPersonalProfile_hasProfileParent() {
final UserHandle profileParent = new UserHandle(0);
final Context mockContext = mock(Context.class);
doReturn(profileParent).when(mUserManager).getProfileParent(any(UserHandle.class));
doReturn(mockContext).when(mContext).createContextAsUser(any(UserHandle.class), anyInt());
mFragment.onAttach(mContext);
assertThat(mFragment.mUserAwareContext).isEqualTo(mockContext);
}
@Test
public void onCreatePreferences_shouldAddResource() {
mFragment.onAttach(mContext);
@@ -175,7 +198,7 @@ public class AvailableVirtualKeyboardFragmentTest {
when(mFragment.getPreferenceScreen()).thenReturn(mPreferenceScreen);
when(mPreferenceManager.getContext()).thenReturn(mContext);
when(mContext.getSystemService(InputMethodManager.class)).thenReturn(mInputMethodManager);
doReturn(mContext).when(mContext).createContextAsUser(any(UserHandle.class), anyInt());
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
}
private List<InputMethodInfo> createFakeInputMethodInfoList(final String name, int num) {