Commit Graph

57192 Commits

Author SHA1 Message Date
Treehugger Robot
ea8022feeb Merge "startActivityForResult with earlier new Intent" into security-aosp-25Q2-staging 2025-06-20 11:52:40 -07:00
Treehugger Robot
145b4a0870 Merge "Prevent SettingsSliceProvider from accessing unused packages" into security-aosp-25Q2-staging 2025-06-19 10:17:12 -07:00
Julia Reynolds
afcd445ef3 Merge "Hide notification content in history" into security-aosp-25Q2-staging 2025-06-10 12:07:15 -07:00
Adam Bookatz
d8166274a0 startActivityForResult with earlier new Intent
We already make sure to use a copy of the Intent, but now we do so
earlier. See bug.

Bug: 353680402
Flag: EXEMPT bugfix
Test: manual
Test: atest com.android.settings.users.UserSettingsTest
            com.android.settings.users.UserDetailsSettingsTest
Change-Id: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
Merged-In: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
(cherry picked from commit b7240e2f0c50455a1c8f3ae1fc4f27d55b86e89b)
2025-06-05 15:25:05 -07:00
Rubin Xu
48e4b5e1af Use correct API to get calling package name in CredentialStorage
Activity.getCallingPackage() does not always return the package
name of the actual calling app. getLaunchedFromPackage() should
be used instead.

Bug: 389681530
Test: manual
Flag: EXEMPT bugfix
Merged-In: Ibdbc45e53f4aa46fae79fa234705b3735bfda4cd
Change-Id: Ibdbc45e53f4aa46fae79fa234705b3735bfda4cd
(cherry picked from commit 70bd3efe0674bccb0d454845d86fb2402779a7bf)
2025-06-05 04:03:10 -07:00
Mill Chen
fc32bd01fa Prevent SettingsSliceProvider from accessing unused packages
DISABLE_TOPIC_PROTECTOR

Bug: 388034510
Test: adb shell cmd slice get-permissions com.android.settings.slices
      atest SettingsSliceProviderTest
Flag: EXEMPT security issue
Change-Id: Ia655fbb9cb46f192559b82f957e3b2f0dd86946c
Merged-In: Ia655fbb9cb46f192559b82f957e3b2f0dd86946c
2025-06-03 00:02:02 -07:00
Julia Reynolds
ac4d72060a Hide notification content in history
- if the user is locked
- and the user has chosen to hide sensistive content when locked

Test: manual with a work profile with a different pin
Bug: 378088320
Flag: EXEMPT bug fix
Change-Id: Ia70454d9859fb788ffa1f48f88760f88c354cdff
(cherry picked from commit 9df37c3f8be2dedd2e44e52da4de45fba33c6a6e)
2025-05-27 09:21:35 -07:00
Treehugger Robot
4f4deeaf16 Merge "Drop PendingIntent extras from external packages during enrollment." into security-aosp-25Q2-staging 2025-05-21 19:33:39 -07:00
Adam Bookatz
094c9df207 Do not enable the Content Protection toggle for non-admin users.
Flag: EXEMPT bugfix
Bug: 409318132
Test: m -j256 Settings && atest
SettingsRoboTests:ContentProtectionTogglePreferenceControllerTest
Change-Id: I46609c795923d427a5b7fa10bc2e8b071fad72d6
(cherry picked from commit ef801e1a8ec3a18ce9e0221fc7e1dfe495d0be8a)
2025-05-20 09:35:32 -07:00
Justin Dunlap
a91dd2fb5b Merge "Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings." into security-aosp-25Q2-staging 2025-05-20 07:55:24 -07:00
Aseem Kumar
ade7c77634 Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings.
Bug: 378902342
Flag: EXEMPT security fix
Change-Id: I0e67f1258cb427c5b998e40a8a0c104af3ead042
(cherry picked from commit 6a896b6b26d445800773e1b4649895bea17eac1f)
2025-05-19 08:56:51 -07:00
Adam Bookatz
586422578d AppRestrictions - use vetted component
After vetting the intent, use the component we used for the vetting.

Bug: 353680402
Bug: 365739560
Test: manual
Flag: EXEMPT bugfix
Change-Id: Iff0d820c1261c29eb6703bf89194339cba700688
(cherry picked from commit d3e34060803c97ae05719fe9301026e5c54892c8)
2025-05-19 08:53:24 -07:00
Joe Bolinger
9dd5ed1cea Drop PendingIntent extras from external packages during enrollment.
Bug: 388528350
Flag: EXEMPT bugfix
Test: atest FingerprintEnrollIntroductionTest FaceEnrollIntroductionTest
Change-Id: I61281dcf95e53100a96d6a218f3f00fd1b4ea3f9
(cherry picked from commit 4ccdeee849d5fef78498ba33cadc525523efcbd7)
2025-05-16 18:04:18 -07:00
tom hsu
edcb16bde3 Improve potential NPE problem
- Move CarrierConfigCache initialization to make sure the instance
   created.

Flag: EXEMPT bug fix
Fix: b/409841639
Test: atest pass
(cherry picked from commit 00ab92f97f2c04ca9f604f282542ffd9680f27fc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c2c6745859027b54628bea81a153856e2d8c753)
Merged-In: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
Change-Id: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
2025-04-21 19:27:43 -07:00
Steve Statia
1127cfb00f Fix hidden menu not showing phone information 100% of the time when opening.
The function that sends the special code is sending intents to all
users, which is creating an activity for both the work profile and the
system user. Whichever intent is received last will be the activity on
top and displayed to the user, and since the work profile's hidden menu does not include the 'Phone
information' option it creates this 'randomness' observed with opening the menu.

This change ag/29101523 started sending the broadcast as UserHandle.ALL, instead of just from the current user causing the reception of more than one intent.

This fix checks for the work profile and returns out of the function without starting another TestingSettings activity.

Flag: EXEMPT bug fix
Bug: 406016005
Test: manual test opening hidden menu, and opening after reboots
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:170fcaf31628d3faf689ce1b525bfba33052d877)
Merged-In: I5a7937ba484afd3ba81c55e66bc53c217a778d18
Change-Id: I5a7937ba484afd3ba81c55e66bc53c217a778d18
2025-04-01 20:42:13 -07:00
tom hsu
c8b730509d [Satellite] Restrict requestIsSupported only in Manual type
- SatelliteManager#requestIsSupported only can be used in Manual
   conneciton type. Hence add a type check with this API for the
   condition check

Flag: EXEMPT bug fix
Fix: b/395811260
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d033f603b819c5b1264d116648c9f6f00b061320)
Merged-In: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
Change-Id: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
2025-03-31 20:54:29 -07:00
tom hsu
e9e45b4a01 [Satellite] Refactor API usage to Util class.
Flag: EXEMPT refactor
Fix: b/403149290
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8916db934fb3d7dc1f94f67c7b409beeff2c6ac6)
Merged-In: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
Change-Id: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
2025-03-31 20:54:17 -07:00
Yuri Lin
0773c4d93f Merge "Merge bundle global & type preference controllers." into main 2025-03-24 12:13:24 -07:00
Chun Zhang
c6aa5cb8cb Merge "Check client null before calling and closing." into main 2025-03-24 10:16:18 -07:00
Chun Zhang
e4ff8c403c Check client null before calling and closing.
Bug: 404955994
Test: TreeHugger
Test: manual
Test: atest SafetySourceBroadcastReceiverTest
Test: atest LockScreenSafetySourceTest
Test: atest ActiveUnlockStatusUtilsTest
Test: atest WearSafetySourceTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I34085b90fe41283e484d3b2235426676d886e69c
2025-03-24 15:11:24 +00:00
Treehugger Robot
dc01092e3b Merge "Customize Fingerprint Enroll FindSensor Activity" into main 2025-03-24 07:21:29 -07:00
Milton Wu
08b35a8729 Customize Fingerprint Enroll FindSensor Activity
Provide an interface for ODM/OEM to override fingerprint enrollment
findSensor page

Bug: 394232846
Flag: EXEMPT interface change
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL
      --ez skip_intro true
Change-Id: Iff61f0be49faf3581fa2b26e364ac8c8d61bdbf3
2025-03-24 02:12:54 -07:00
Zhibin Liu
32bc5aab59 Merge "Add support to configure state of operator name in status bar [2/2]" into main am: 7c598253ff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3516771

Change-Id: Icbafc5ffafb3181412e181800505c3d8be6ae5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-24 00:57:43 -07:00
Zhibin Liu
7c598253ff Merge "Add support to configure state of operator name in status bar [2/2]" into main 2025-03-24 00:15:24 -07:00
Jacky Wang
4dc8d32603 [Catalyst] Wi-fi calling is missing from PreferenceService
Bug: 388420844
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I7809ddba84805af52c9234f5f51d093c285db74a
2025-03-24 07:34:46 +08:00
Shawn Willden
fb2d3b7abb Catch security exception on isOemUnlockAllowed
As of Android 15, devices with FRP active will throw an exception when loading developer options attempts to update the OEM unlock state, which causes the app to crash.  This CL just catches the exception and reports that OEM unlock is not, in fact, settable.

A full fix should probably tell the user that OEM unlock may not be set because FRP is active, rather than just quietly failing and logging the situation, but because GMS Core is soon going to begin blocking access to the Android UI when FRP is active, meaning that developer options won't even be reachable and the user will be informed about FRP state by GMS Core, the effort that would require isn't justified.

Note that this CL does not add a test for this change because it is not possible for CTS to put the device in FRP-active state to test the relevant case.  Manual testing is required.

Test: SettingsUnitTests
Flag: EXEMPT bugfix
Bug: 405023810
Change-Id: Ic43de93a4208bbc17f2e287d52f9baf281cd678c
2025-03-21 15:46:11 -07:00
Yvonne Jiang
081fab1330 Merge "Update "Manage PIN" entry point." into main 2025-03-21 15:05:09 -07:00
Yvonne Jiang
2887142833 Update "Manage PIN" entry point.
- Updates default icon to outlined version
- Makes availability conditional on existence of supervising credential
- Does not disable entry point when the main switch is disabled

Bug: 405159398
Test: atest SupervisionPinManagementScreenTest
Test: atest SupervisionDashboardScreenTest
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Change-Id: I764a6b767019007a93aacf29ecf47677e16cb058
2025-03-21 12:10:30 -07:00
tom hsu
8be6d98b1f [Satelllite] Avoid using "add ESIM page"
- When user clicks preference UI, show a dialog to nofity user
   satellite session.

Flag: EXEMPT bug fix
Fix: b/402544816
Test: atest pass
Test: Manual test

Change-Id: Ifeff9368fed906bc56abcc8eb23748a71f79ee4d
2025-03-21 13:48:21 +00:00
Yiyi Shen
14fe4f0f01 Merge "Add logs to debug anr issues" into main 2025-03-21 03:03:53 -07:00
Yuanru Qian
6728a8380a Merge "Log connected devices entrypoint for analytics" into main 2025-03-21 02:55:18 -07:00
Haijie Hong
93a4eaa4b2 Merge "Don't show footer for headset when bonding loss" into main 2025-03-21 02:52:39 -07:00
Treehugger Robot
af3a006b2a Merge "Add context to FingerprintExtPreferencesProvider" into main 2025-03-21 02:23:39 -07:00
Treehugger Robot
dc34cabee1 Merge "Show hearing device pairing intro according to the device's supported status" into main 2025-03-21 01:55:57 -07:00
Yiyi Shen
1ea2a2c10d Add logs to debug anr issues
Test: atest
Bug: 404470387
Flag: EXEMPT add log
Change-Id: Ide2b7dd730c21bf5da38a0fc7cf721aa969b1959
2025-03-21 16:38:35 +08:00
yqian
c96b555141 Log connected devices entrypoint for analytics
Test: locally tested
Bug: N/A
Flag: EXEMPT loggings only
Change-Id: I5158a026fecdd19245f7427431563dd754dff2eb
2025-03-21 16:17:14 +08:00
Haijie Hong
026d698a91 Don't show footer for headset when bonding loss
Test: local tested
Flag: EXEMPT minor fix
Bug: 380801155
Change-Id: I5bb1bbcb08723a5ac5c8b82d2428df7a7f3e275d
2025-03-21 16:14:50 +08:00
Mir Noshin Jahan
9d9dd7e3f5 Merge "Use separate metric actions and tag id for wifi scorer and auto mobile network switch" into main 2025-03-21 00:38:41 -07:00
jasonwshsu
e3eb185e00 Show hearing device pairing intro according to the device's supported status
Bug: 390078046
Test: atest HearingDevicePairingIntroPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I19b9825a55732c9edb058dd517d6021549e55307
2025-03-21 14:28:12 +08:00
MiltonWu
7379aee081 Add context to FingerprintExtPreferencesProvider
Bug: 405274627
Test: atest FingerprintSettingsFragmentTest
Flag: EXEMPT interface changed
Change-Id: I66527bab885555df1dcab087862e5b1a96593ef5
2025-03-21 06:24:47 +00:00
Treehugger Robot
5540cd1606 Merge "[Satellite] Show category of Your data plan with Manual connection type." into main 2025-03-20 22:05:59 -07:00
Treehugger Robot
53c6e5d453 Merge "Add metrics for region change dialog" into main 2025-03-20 21:05:03 -07:00
tom hsu
0569647a24 [Satellite] Show category of Your data plan with Manual connection type.
- When satellite entitlement is unsupported, it shall show the category of Your data plan with Manual connection type.

Flag: EXEMPT bug fix
Fix: b/405250203
Test: atest pass
Change-Id: I91c5be123d59753d93db37226d0ae17ebb5ea1f5
2025-03-20 20:42:00 -07:00
Shawn Lin
40afe16b19 Merge "Add ways to dismiss check enroll fingerprint dialog" into main 2025-03-20 19:13:35 -07:00
Jigar Thakkar
5153b7d5eb Merge "Fix accessibility labels for private space animations" into main 2025-03-20 16:21:03 -07:00
Jigar Thakkar
e4201e8af4 Fix accessibility labels for private space animations
The change adds appropriate content descriptions to animations used
within the private space setup flow based on the state of the animation.

Bug: 403398693
Test: manual
Change-Id: I6ac7a5d206083b651b48f9bcf28e3639bdce60b4
2025-03-20 19:23:42 +00:00
Hani Kazmi
65761e24db Merge "[AAPM] Open Settings from Dialog in New Task" into main 2025-03-20 11:39:22 -07:00
Treehugger Robot
cae1c7a68c Merge "WebView: defend against null array" into main 2025-03-20 09:50:29 -07:00
danielwbhuang
3796245d45 Add metrics for region change dialog
1. ACTION_CHANGE_REGION_DIALOG_POSITIVE_BTN_CLICKED
2. ACTION_CHANGE_PREFERRED_LANGUAGE_REGION_POSITIVE_BTN_CLICKED
3. ACTION_CHANGE_REGION_DIALOG_NEGATIVE_BTN_CLICKED
4. ACTION_CHANGE_PREFERRED_LANGUAGE_REGION_NEGATIVE_BTN_CLICKED

Bug: 389568296
Test: manual
Flag: EXEMPT bugfix
Change-Id: Ic6739c8ec31f8027d6879b584cd92a748d5c7f12
2025-03-20 22:23:57 +08:00
Hani Kazmi
e2bf7d5e03 [AAPM] Open Settings from Dialog in New Task
Test: Presubmit
Test: Manually tested on device
Bug: 404595286
Flag: EXEMPT bugfix
Change-Id: Ib100861a09429f1df7cfc909cb567f45cff44401
2025-03-20 05:57:26 -07:00