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

Use primary profile lock settings string in Safety Source, not work profile

Browse Source 
Test: atest CtsSafetyCenterTestCases
Bug: 215518847
Change-Id: I1c7ddbeb05be81fa902fcb4e42868ddd770d2dc0
This commit is contained in:
Marie Matheson
2022-02-22 20:14:50 +00:00
parent 67c0b83f7f
commit d4822fe6b4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/safetycenter/LockScreenSafetySource.java
View File

@@ -57,7 +57,7 @@ public final class LockScreenSafetySource {
screenLockPreferenceDetailsUtils); screenLockPreferenceDetailsUtils);
final SafetySourceStatus status = new SafetySourceStatus.Builder( final SafetySourceStatus status = new SafetySourceStatus.Builder(
context.getString(R.string.unlock_set_unlock_launch_picker_title_profile), context.getString(R.string.unlock_set_unlock_launch_picker_title),
screenLockPreferenceDetailsUtils.getSummary(UserHandle.myUserId()), screenLockPreferenceDetailsUtils.getSummary(UserHandle.myUserId()),
screenLockPreferenceDetailsUtils.isLockPatternSecure() screenLockPreferenceDetailsUtils.isLockPatternSecure()
? SafetySourceStatus.STATUS_LEVEL_OK ? SafetySourceStatus.STATUS_LEVEL_OK

2
tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java
View File

@@ -108,7 +108,7 @@ public class LockScreenSafetySourceTest {
assertThat(safetySourceStatus.getTitle().toString()) assertThat(safetySourceStatus.getTitle().toString())
.isEqualTo(ResourcesUtils.getResourcesString( .isEqualTo(ResourcesUtils.getResourcesString(
mApplicationContext, mApplicationContext,
"unlock_set_unlock_launch_picker_title_profile")); "unlock_set_unlock_launch_picker_title"));
assertThat(safetySourceStatus.getSummary().toString()) assertThat(safetySourceStatus.getSummary().toString())
.isEqualTo(SUMMARY); .isEqualTo(SUMMARY);
assertThat(safetySourceStatus.getPendingIntent().getIntent()).isNotNull(); assertThat(safetySourceStatus.getPendingIntent().getIntent()).isNotNull();