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

Update preference summary for ExternalSourcesDetails page when Advanced Protection is on

Browse Source 
The summary is now "Disabled".

Bug: 398167869
Test: ExternalSourcesDetailsTest
Flag: EXEMPT bug fix
Change-Id: I1d8975671671c31b3176a39e07574ff623ed1a96
This commit is contained in:
Azhara Assanova
2025-02-24 16:46:07 +00:00
parent d82f6583fb
commit c278a92940
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
View File

@@ -95,8 +95,7 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
userHandle)) {
if (RestrictedLockUtilsInternal.isPolicyEnforcedByAdvancedProtection(context,
DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY, userHandle.getIdentifier())) {
return context.getString(com.android.settingslib.widget.restricted
.R.string.disabled_by_advanced_protection);
return context.getString(com.android.settingslib.R.string.disabled);
} else {
return context.getString(
com.android.settingslib.widget.restricted.R.string.disabled_by_admin);

10
tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
View File

@@ -333,7 +333,7 @@ public class ExternalSourcesDetailsTest {
@RequiresFlagsEnabled(android.security.Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
@Test
public void getPreferenceSummary_restrictedGlobally_adminString() {
public void getPreferenceSummary_restrictedGloballyByAdmin_adminString() {
final EnforcingAdmin nonAdvancedProtectionEnforcingAdmin = new EnforcingAdmin("test.pkg",
UnknownAuthority.UNKNOWN_AUTHORITY, mUserHandle, new ComponentName("", ""));
@@ -353,7 +353,7 @@ public class ExternalSourcesDetailsTest {
@RequiresFlagsEnabled(Flags.FLAG_AAPM_FEATURE_DISABLE_INSTALL_UNKNOWN_SOURCES)
@Test
public void getPreferenceSummary_restrictedGlobally_advancedProtectionString() {
public void getPreferenceSummary_restrictedGloballyByAdvancedProtection_disabledString() {
final EnforcingAdmin advancedProtectionEnforcingAdmin = new EnforcingAdmin("test.pkg",
new UnknownAuthority(ADVANCED_PROTECTION_SYSTEM_ENTITY), mUserHandle,
new ComponentName("", ""));
@@ -363,12 +363,10 @@ public class ExternalSourcesDetailsTest {
advancedProtectionEnforcingAdmin);
when(mUserManager.hasUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
mUserHandle)).thenReturn(true);
when(mContext.getString(
com.android.settingslib.widget.restricted.R.string.disabled_by_advanced_protection))
.thenReturn("disabled_by_advanced_protection");
when(mContext.getString(com.android.settingslib.R.string.disabled)).thenReturn("disabled");
CharSequence summary = ExternalSourcesDetails.getPreferenceSummary(mContext, mAppEntry);
assertEquals("disabled_by_advanced_protection", summary.toString());
assertEquals("disabled", summary.toString());
}
}