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 am: d4822fe6b4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16979281

Change-Id: I1a57ff9d5edbed4be2052ac69344b9132f157ba8
This commit is contained in:
Marie Matheson
2022-02-23 17:34:53 +00:00
committed by Automerger Merge Worker
parent 4dd6d11064 d4822fe6b4
commit cf3d09834e
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();