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

Merge "Fix crash when trying to open app info page" into rvc-dev am: a43e978ffb am: 37f7b8e26e am: f979cd94b8 am: bc47ba6807

Browse Source 
Change-Id: I2ce5ad73dca56e7f407412c4862d0f7112f3c9ca
This commit is contained in:
TreeHugger Robot
2020-04-01 23:07:15 +00:00
committed by Automerger Merge Worker
parent 83c58cda4b bc47ba6807
commit 14934ed6e3
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java
View File

@@ -75,7 +75,7 @@ public class InteractAcrossProfilesDetailsTest {
assertThat(InteractAcrossProfilesDetails.getPreferenceSummary(
mContext, CROSS_PROFILE_PACKAGE_NAME))
.isEqualTo(mContext.getString(R.string.app_permission_summary_allowed));
.isEqualTo(mContext.getString(R.string.interact_across_profiles_summary_allowed));
}
@Test
@@ -98,7 +98,21 @@ public class InteractAcrossProfilesDetailsTest {
assertThat(InteractAcrossProfilesDetails.getPreferenceSummary(
mContext, CROSS_PROFILE_PACKAGE_NAME))
.isEqualTo(mContext.getString(R.string.app_permission_summary_not_allowed));
.isEqualTo(mContext.getString(
R.string.interact_across_profiles_summary_not_allowed));
}
@Test
public void getPreferenceSummary_noWorkProfile_returnsNotAllowed() {
shadowOf(mUserManager).addUser(
PERSONAL_PROFILE_ID, "personal-profile"/* name */, 0/* flags */);
shadowOf(mPackageManager).setInstalledPackagesForUserId(
PERSONAL_PROFILE_ID, ImmutableList.of(CROSS_PROFILE_PACKAGE_NAME));
assertThat(InteractAcrossProfilesDetails.getPreferenceSummary(
mContext, CROSS_PROFILE_PACKAGE_NAME))
.isEqualTo(mContext.getString(
R.string.interact_across_profiles_summary_not_allowed));
}
private PermissionInfo createCrossProfilesPermissionInfo() {