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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-01 21:43:47 +00:00
committed by Android (Google) Code Review
parent c78ad2087d f9a03cd415
commit a43e978ffb
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -240,6 +240,9 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
Context context, String packageName) {
UserManager userManager = context.getSystemService(UserManager.class);
UserHandle workProfile = InteractAcrossProfilesSettings.getWorkProfile(userManager);
if (workProfile == null) {
return false;
}
UserHandle personalProfile = userManager.getProfileParent(workProfile);
return context.getSystemService(
CrossProfileApps.class).canConfigureInteractAcrossProfiles(packageName)

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() {