Commit Graph

35 Commits

Author SHA1 Message Date
Elliot Sisteron
6356de3f9b Launch work profile entries intent in the profile parent.
The screens don't work as expected if they're launched in the work
profile. The reason for this is that Settings handle the user separately
with an extra inside the intent. I assume launching the actual screen in
a separate user is not supported.

Note that I've also:
1. Added a safeguard to make sure that the "active unlock" code path
   only occurs in the profile parent — it seems preferrable (see
   b/277877289#comment4)
2. Added the user id as an identifier on the intents lauched by the
   entries. The reason we do this is to make sure the user id is taken
   into account in the PendingIntent#equals implementation. This was
   automatically taken care of when launching with the profile context,
   but now that we launch everything in the profile parent context we
   have to make sure the user id is taken into account

Bug: 278665241
Bug: 277877289
Test: manual
Change-Id: Idcaa31cd56ed64768aa8f069d30d2adeb7269099
2023-04-18 17:24:39 +00:00
Elliot Sisteron
6a1ec7553c Redirect to the right combined biometrics in work profile.
Bug: 277760649
Test: manual
Change-Id: Iab3e46a6964ceb4bf2241560ad7820844f8ae88c
2023-04-12 10:46:01 +00:00
Derek Jedral
4d32e70a60 Show CombinedBiometric if active unlock enabled
We want to show this page as long as active unlock is enabled. The
underlying check of isAvailable checks if the appropriate biometrics are
available and updates the title accordingly.

Test: manual test, confirm combined page appears when active unlock on
Test: atest BiometricsSafetySourceTest
Bug: 264812908
Change-Id: I5da1c20d65b879751bdd615c14c2f8a71cc54d80
2023-02-14 22:24:25 +00:00
Prabal Singh
9463e91f6f Add new category key for More Settings page
Test: manually tested
Bug: b/260060884
Change-Id: Ida3816203a85cb267bc57e1b19bb9b9b81ee955d
2023-02-07 16:56:15 +00:00
Prabal Singh
e312ffa512 Merge "Add support for Biometrics for work Source for SC" 2023-02-02 10:59:13 +00:00
Max Spencer
ab8c9d79f4 No screen lock notification
Settings already sends a SafetySourceIssue to Safety Center when the
user has not set a screen lock. This CL specifies the corresponding
notification for Safety Center to post for that issue.

Also specified the actionability of this issue as manual (although
this is the default so no functional change here, just for clarity).

Fix: 265799125
Bug: 260574754
Test: Manually
Change-Id: I9d579cdb8061d247e89031a5bc360f8fd5848277
2023-01-31 10:48:58 +00:00
Prabal Singh
e7b9d04222 Add support for Biometrics for work Source for SC
Fixes: b/266818876
Fixes: b/238870897
Test: manually tested
Change-Id: I674b89226c445399dea69e4355b124f376e7f38d
2023-01-29 04:40:05 +00:00
Prabal Singh
52ba133285 Create MoreSecurtiyPrivacyFragment
Created a new MoreSecurityPrivacyFragment, a new
more_security_privacy_settings xml.
This more_security_privacy_settings xml is a created by merging
privacy_advanced_settings.xml and security_advanced_settings.xml and the
MoreSecurityPrivacyFragment is created by merging
PrivacyDashboardFragment and SecurityAdvancedSettings fragments.

Test: adb shell am start -a com.android.settings.security.MORE_SECURITY_PRIVACY_SETTINGS
Bug: b/261557620
Change-Id: I8729f4eaf25a31f91354383e7b6cb5e0fc7df976
2023-01-26 14:43:00 +00:00
Simon Wingrove
f2b0cedcd0 Distinguish multiple PendingIntents via requestCode
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.

A unique request code can be used to distinguish between them.

Bug: 238605613
Test: atest LockScreenSafetySourceTest
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
2022-07-12 09:55:59 +00:00
Giulio Fiscella
de0c2a08dd Add refresh broadcast id checks
Test: atest SettingsUnitTests
Bug: 224522714
Change-Id: Id49767c27ecd842fc9d886cbf5bc0eee9eabc775
2022-05-13 11:20:05 +00:00
Giulio Fiscella
7afcf4efdb Use more unique ids for safety sources
Test: atest SettingsUnitTests
Bug: 227291608
Change-Id: I8815d14fc402cd25bcf49848c86e21ded552a542
Merged-In: I8815d14fc402cd25bcf49848c86e21ded552a542
2022-04-04 16:46:26 +00:00
Giulio Fiscella
2a775c69fc Use migrated severity levels
Bug: 225388845
Test: atest SettingsUnitTests
Change-Id: I8e7f06dc8fa7c96c14de738e19dee11ec967bb0c
2022-03-24 18:57:21 +00:00
Yuri Ufimtsev
af22553089 Postpone getting Metrics Category until it is needed
Test: manual

Bug: 226105654
Change-Id: I9473ddfd72e38bff4f93b43d539c467b2e13e258
2022-03-23 15:41:54 +00:00
Giulio Fiscella
9112567332 Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
Merged-In: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
2022-03-17 11:44:39 +00:00
Yuri Ufimtsev
4e255cb407 Set the Refresh Broadcast ID for Safety Event if available
Test: atest SettingsUnitTests

Bug: 222679576
Change-Id: I52ba3aff3045a8211fc936240f1310da6fad9fb0
2022-03-15 15:23:07 +00:00
Marie Matheson
a0ce0e6340 Bug fix - when enrolled, biometrics have ok safety state.
Bug: 222336582
Test: atest SettingsUnitTests
Change-Id: Ia90329fa126b181e87ff7ed626ba33eca1e6bf7d
2022-03-09 19:24:18 +00:00
Marie Matheson
2adf0a066f Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev 2022-03-08 14:02:57 +00:00
Marie Matheson
cc97297375 Minor bug fixes for Lockscreen Safety Center source
- use correct severity enum for issues
- update biomterics on lockscreen change
- clean up some nearby tests to use eq matcher instead of captor

Test: SettingsUnitTests
Test: Manually tested
Bug: 223170514
Bug: 222338885
Change-Id: I4e28a418473cbe7cd5d75daf0d62776654fa7917
2022-03-07 20:02:56 +00:00
Yuri Ufimtsev
f15bebe6c3 Inject different User IDs into biometric utils
Test: atest SettingsUnitTests

Bug: 222217132
Change-Id: I7939d78817f53814d0f8fb4636231a4833fbe26a
2022-03-07 10:04:25 +00:00
Karishma Vakil
e23cd8ad0b [SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs
Test: atest SettingsUnitTests
Bug: 219195246
Bug: 219078602
Bug: 218852160
Change-Id: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
Merged-In: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
2022-03-03 01:52:01 +00:00
Yuri Ufimtsev
abc541d56d Merge "Provide data for BiometricsSafetySource" into tm-dev 2022-03-01 16:52:46 +00:00
Yuri Ufimtsev
6cadee43e5 Add warning card for Safety Center when no screen lock is set
Test: atest SettingsUnitTests

Bug: 218868097
Change-Id: I4cbc50559dd1d32b5b916a19f7d0b2b27d67510d
2022-03-01 15:52:56 +00:00
Yuri Ufimtsev
2b5bf34eda Provide data for BiometricsSafetySource
Test: atest SettingsUnitTests

Bug: 215517420
Bug: 221449065
Change-Id: Id635a02443295757aab277971c4d95a9a62f5576
2022-02-28 21:27:54 +00:00
Marie Matheson
9f7374b045 On Settings lockscreen changes send new safety status to Safety Center.
Bug: 215518847
Test: atest SettingsUnitTests
Test: make RunSettingsRoboTests
Change-Id: Id8e957e58c45195260157b2b61b93ecbc203164b
2022-02-28 16:36:46 +00:00
Marie Matheson
aa43d6f06b Merge "Rename safety source ids to match format from other apps." into tm-dev 2022-02-24 12:56:23 +00:00
Marie Matheson
d4822fe6b4 Use primary profile lock settings string in Safety Source, not work profile
Test: atest CtsSafetyCenterTestCases
Bug: 215518847
Change-Id: I1c7ddbeb05be81fa902fcb4e42868ddd770d2dc0
2022-02-23 13:42:03 +00:00
Marie Matheson
26f5dfd966 Rename safety source ids to match format from other apps.
Test: atest SettingsUnitTests
Bug: 16979198
Change-Id: I671779281c594ad69b9f4b6aa5473aac5e7854a1
2022-02-22 21:14:46 +00:00
Marie Matheson
ce321f0dd0 Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper
Test: SettingsUnitTests
Bug: 220384387
Change-Id: I3886d3cf4717b5c7efd99ebd8ffb6a039e3565a4
2022-02-22 16:36:17 +00:00
Yuri Ufimtsev
fc9b13e865 Provide data to LockScreenSafetySource
Test: atest SettingsUnitTests

Bug: 215515298
Change-Id: I59640e9f691754a2225870d40f5db3e6fd8557f8
2022-02-18 23:47:42 +00:00
Marie Matheson
1106faf2cf Send safety center status on boot
Bug: 215517959
Test: atest SettingsUnitTests
Change-Id: Id34d68063b2bacd07c932b294b36546160384e92
2022-02-14 20:33:57 +00:00
Marie Matheson
bf6a2c8136 Handle null safety source id list in broadcast receiver.
Bug: 215515448
Test: atest SettingsUnitTests
Change-Id: I5c8b24533c4ce39ff28f533fbfc7e386639f4983
2022-02-14 16:40:45 +00:00
Marie Matheson
125a84f0cb Adds LockScreen SafetySource and SafetySource broadcast receivers.
Adds a basic LockScreen SafetySource with placeholder data.
Adds a no-op Biometric SafetySource.
Adds Broadcast Receiver and responds with data.

Test: atest SettingsUnitTests
Bug: 215516488
Bug: 215515448
Change-Id: I753a10f63fc73984c7ff96347b927bb2ca5a0aba
2022-02-10 13:01:16 +00:00
Jan Tomljanovic
9d2ec95c61 Call system service API instead of checking the phenotype flag directly.
Test: atest SettingsUnitTests
Bug: 208625216
Change-Id: Ib551cbaf0f09fe49bd81ef657037401263705521
2022-01-17 17:06:50 +00:00
Jan Tomljanovic
9ef7f72349 Toggle Security and Privacy entries depending on SafetyCenter status.
Test: atest SettingsUnitTests
Bug: 206798563
Change-Id: I4c813a35754fa7ed5db630fa4c41ef14b469878c
2021-12-08 18:05:31 +00:00
Jan Tomljanovic
6fd0716f58 Add SafetyCenter entry to Settings.
Test: atest SettingsUnitTests
Bug: 204978295
Change-Id: I9bedb58ad740b4ee76620e04675a0aefa659566a
2021-12-01 18:40:57 +00:00