Commit Graph

54142 Commits

Author SHA1 Message Date
Pawan Wagh
4c647972fe Merge "Set 16K dev option as checked by default for 16KB page size" into main 2024-04-30 03:33:54 +00:00
Tom Hsu
1b308f5df8 Revert^2 "Add a new warning dialog for Satellite mode"
This reverts commit 15c90207e2.

Reason for revert: ag/27138142 shall fix the crash instead of reverted one.

Change-Id: Icf46fda7af9c9bb6921bc10de0f9c93926f42fac
2024-04-30 02:17:15 +00:00
Priyanka Advani
fe0eedf1e3 Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: 134635786f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27145129

Change-Id: Ica49442da20fcea404ad95a2591506991a8e55b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 22:48:38 +00:00
Joshua McCloskey
4efd4c16f9 Restart fingerprint auth on cancel.
Test: atest FingerprintSettingsFragmentTest
Fixes: 336572954
Change-Id: Ie64d509caf052271a141e466f5c840e92f5dc119
2024-04-29 22:30:23 +00:00
Treehugger Robot
c81e0cb16a Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev 2024-04-29 22:24:00 +00:00
Pawan Wagh
a961dfe289 Apply OTA from /vendor/boot_otas
If BOARD_16K_OTA_MOVE_VENDOR := true is set, OTAs will be present at
/vendor/boot_otas for 16KB developer option. Apply OTA from vendor if
present, otherwise fallback to system OTAs

Test: m, m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 335022191
Change-Id: I534b354c830de2c90fee76502667d5e4ef5a7714
2024-04-29 22:17:46 +00:00
Priyanka Advani
134635786f Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-29 22:13:31 +00:00
Priyanka Advani
93e4c65d3d Revert "Create CallStateRepository.isInCallFlow"
This reverts commit 6142ad927e.

Reason for revert: Droid-monitor created revert due to Build breakage in b/337914519. Will be verifying through ABTD before submission.

Change-Id: I300d5397de156fd0815965cfd99f0814f1365ffc
2024-04-29 20:31:15 +00:00
Yuri Lin
1427faad9c Merge "Add flow for updating zen mode status on modes pages" into main 2024-04-29 19:16:27 +00:00
Yuri Lin
b77b2ec7c8 Add flow for updating zen mode status on modes pages
The main responsibility for updating stored ZenMode data when updated is the Settings page, which reloads mode data whenever any changes are detected. This change adds a process for that Settings page to then update the ZenMode data associated with all controllers on that page.

Flag: android.app.modes_ui
Bug: 335259054
Test: manual with toy implementations
Change-Id: Ie1692da54d962c90378085d8bd8573e5b93f8eb6
2024-04-29 12:55:42 -04:00
Manish Singh
4875662f48 Apply personal filter when private tab not shown
Bug: 336327005
Fix: 337744275
Test: manual
Change-Id: I1c8cbc35f90cd39bb332f9a6b787473779249166
2024-04-29 15:48:24 +00:00
Chaohui Wang
e4e6f0ecf4 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev am: ac55241fc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139248

Change-Id: Ie5cde4ca5e04167a63fd41adfb5ccd1376a0d870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 12:51:24 +00:00
Tom Hsu
b5391d1d3f Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 45549d928b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139078

Change-Id: Ib7b007734f3916b5caf652a79708f20f8df90bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 12:51:08 +00:00
Chaohui Wang
ac55241fc5 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev 2024-04-29 12:37:44 +00:00
Tom Hsu
45549d928b Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-29 12:34:55 +00:00
SongFerng Wang
55927a6318 Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev am: 33f5aa3897
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139247

Change-Id: I832da1d22799ba554696a66c2087c1ab6c84e201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 12:03:05 +00:00
Manish Singh
0f4d761d93 Merge "Don't send data for non-main users" into main 2024-04-29 11:51:46 +00:00
SongFerng Wang
33f5aa3897 Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev 2024-04-29 11:39:12 +00:00
ELIYAZ MOMIN
15c90207e2 Revert "Add a new warning dialog for Satellite mode"
This reverts commit 680d062c77.

Reason for revert: <Potential culprit for b/337796129  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
>

Change-Id: I6fbb7a0587fbb474012e1a97a75c036420500f99
2024-04-29 11:37:35 +00:00
Tom Hsu
71e0980f4c Merge "Add a new warning dialog for Satellite mode" into 24D1-dev am: cec2f402a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27113656

Change-Id: I4962f1906eb66b54385d459fc2a3cc987ee74b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 11:17:30 +00:00
Oli Thompson
fb08a80955 Correctly unlock storage for work profiles with unified challenge
When turning off quiet mode for work profiles, ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER is fired
to confirm the device/profile PIN in order to decrypt the profile's storage. For work profiles with
unified challenge, we are expected to call LockPatternUtils.verifyTiedProfileChallenge() that
specifically decrypts the work profile's storage using the device PIN. This code flow is only reachable
when mForceVerifyPath is true in ConfirmDeviceCredentialActivity. In
I8b61e7d2df5792cbdb2e12b19e5a5582ea2290b7 a regression was introduced that caused the wong condition
to be used, and as a result work profile with unified challenge is no longer unlocked correctly in
this unlock flow. This bug is normally masked since we cache the unified work profile's password and
don't ask the user for device PINs most of the time. It's only reproducible when turning on work
profile from the keyguard, when we don't use the password cache. Fix this by using the right condition.



Bug: 328640625
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I5eb9379dc140c9803f033beee38fcd63aa9a85c0
2024-04-29 11:13:05 +00:00
Tom Hsu
cec2f402a9 Merge "Add a new warning dialog for Satellite mode" into 24D1-dev 2024-04-29 10:57:55 +00:00
Chaohui Wang
6142ad927e Create CallStateRepository.isInCallFlow
Which will emit true if any active sub is in call.

And also create SubscriptionActivationRepository to use isInCallFlow.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: unit test
Change-Id: I75460bf17961349557ac1e19e7f6b15249f3d7b0
2024-04-29 10:15:13 +00:00
SongFerng Wang
e2dcee3aec Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException
Bug: 329293848
Change-Id: Id775f6db2a90a59278f9b522b60680695d75c4a4
Test: build pass
2024-04-29 09:28:32 +00:00
tomhsu
680d062c77 Add a new warning dialog for Satellite mode
Bug: 337154438
Test: atest pass.
Test: Maunal test pass.
Change-Id: I33dbf3502c780cedd5422e2b44678ecb9a22a662
2024-04-29 08:37:28 +00:00
Ivan Chiang
dade97f27c Merge "Add the different summary for the app store details" into main 2024-04-29 04:26:18 +00:00
Treehugger Robot
30ce935274 Merge "Update constants" into main 2024-04-26 23:31:49 +00:00
Meng Wang
bcf91ee6a7 When erasing an eSIM, verify the device screen PIN lock if one is set.
SIM PIN lock existence isn't checked anymore.

Bug: 335672518
Test: b/335672518#comment6
Merged-In: Iff40c1fb9a2463311768d24d09dfc3aeeee128f9
Change-Id: Iff40c1fb9a2463311768d24d09dfc3aeeee128f9
2024-04-26 21:28:58 +00:00
Treehugger Robot
a50513ec6d Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into main 2024-04-26 21:27:38 +00:00
Meng Wang
1331449353 When erasing an eSIM, verify the device screen PIN lock if one is set.
SIM PIN lock existence isn't checked anymore.

Bug: 335672518
Test: b/335672518#comment6
Change-Id: Iff40c1fb9a2463311768d24d09dfc3aeeee128f9
2024-04-26 20:33:38 +00:00
Jason Chiu
a2ae051044 Merge "Revert "Fix crash of starting private app info pages for LS"" into main 2024-04-26 13:20:55 +00:00
Joseph Vincent
812eef847e Merge "Add line break strategy to remove header hyphenation" into main 2024-04-26 09:54:00 +00:00
Jason Chiu
a09d2650b9 Revert "Fix crash of starting private app info pages for LS"
This reverts commit f9fabeae1c.

Reason for revert: Java crash when trying to open Settings on secondary user

Bug: 336697633
Bug: 337044085
Change-Id: I0c6793ce2a28294c093c9786cecddd19bd643141
2024-04-26 09:17:45 +00:00
Samuel Huang
9b8558394c Fix the "Use this SIM" switch does not disable during phone calls am: 4f454b43c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27105181

Change-Id: I2be1b144aa7d1d120692ccfece3c921e488fc308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 09:13:17 +00:00
Samuel Huang
4f454b43c6 Fix the "Use this SIM" switch does not disable during phone calls
If the registration failed (e.g., device doesn't support satellite), SatelliteManager will not emit the current state by callback. We send `false` value by ourself to make sure the flow has initial value.

Bug: 315928920
Test: atest, manual
Change-Id: Ic87f71bc576cfb1f8e4053c5784fca401adaec08
2024-04-26 05:54:40 +00:00
Treehugger Robot
984039eec8 Merge "Provide different ways to detect battery defender." into main 2024-04-26 04:18:55 +00:00
Samuel Huang
a94bfd4a47 Merge "Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started" into 24D1-dev am: fea80bf236
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27071155

Change-Id: Idcbc71555ddbebbd28553530ca8ddd6e364635ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 03:22:25 +00:00
Yiling Chuang
11e810e7a7 Provide different ways to detect battery defender.
Bug: 335567248
Test: robotests
Change-Id: Ie1d3d7da99fa698468ffd124410cfd3b56bc0c34
2024-04-26 03:10:51 +00:00
Samuel Huang
fea80bf236 Merge "Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started" into 24D1-dev 2024-04-26 03:08:53 +00:00
Yurii Zubrytskyi
67466de364 Don't overwrite the system global gender settings
Developer setting shouldn't rewrite the proper user-selected value.
This is best effort and will still overwrite it when the values
used to be the same.

Bug: 332955145
Test: manual
Change-Id: I7c350ff84dfc7e216835ab3b45b7c1316ea78155
2024-04-25 17:15:49 -07:00
Eric Biggers
3fd46cc27d Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
Since the class 'android.security.KeyStore' is going away, the UID_SELF
constant is being moved to a more appropriate location in KeyProperties.
Update code that references this constant to use the new location.  No
change in behavior; the value of the constant remains the same.

Bug: 326508120
Test: build
Flag: NONE mechanical refactoring with no behavior change
Change-Id: Iaca5b20c37b7952df8f26a99b3f7391c5a7f01b6
2024-04-25 19:21:31 +00:00
Rafael Higuera Silva
1d307afd95 Merge "Extract and fix logic for showing rac dialog." into 24D1-dev am: 958b737fcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27072479

Change-Id: I9f5c4c8dea3c7aebc73b5121d6ace7aca22c1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 19:07:24 +00:00
Tetiana Meronyk
86322e6398 Merge "Keep Multiuser toggle hint visible at all times" into main 2024-04-25 16:16:18 +00:00
Samuel Huang
faa640e8fc Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started
When satellite session is started, we need to suppress the 'Choose SIM for mobile data' and 'Update preferred SIM' dialogs to prevent user turn on SIM.

Bug: 334139957
Test: atest, manual
Change-Id: Id56a98f3d1cfd38875173a643c992393d3dbeec8
2024-04-25 13:34:43 +00:00
Manish Singh
50b5bae531 Don't send data for non-main users
This is a regression caused by ag/26661827

Fix: 333872544
Test: manual
Test: atest PrivateSpaceSafetySourceTest
Change-Id: I0465899af3745fa39eab8806dbceb347d70b0aa3
2024-04-25 12:23:40 +00:00
Tetiana Meronyk
37ac9a393b Keep Multiuser toggle hint visible at all times
Bug: 336773027
Test: atest UserSettingsTest
Change-Id: Ib5f4ad674c4099a276c8c86d0ed96bdba956540c
2024-04-25 11:41:09 +00:00
Manish Singh
544fa52e1a Merge "Don't show uninstall for all users" into main 2024-04-25 09:30:05 +00:00
Chaohui Wang
446e0a18d1 Refresh the preferred APN after "Reset to default"
Previously, ApnSettings will updated the preferred APN selection when
data connection changes, but this is not the source of truth.

Observe the preferred APN directly to fix.

Fix: 257316932
Test: manual - on ApnSettings
Test: unit test
Change-Id: Ie323316ab8f7fa63edf5cf90633bcdd4486728c4
2024-04-25 11:14:21 +08:00
Ivan Chiang
6afb9ece62 Add the different summary for the app store details
When the initiating package is different from the installing package,
show the different summary. E.g WebApk

Test: atest AppInstallerInfoPreferenceTest
Bug: 329140383
Change-Id: Icd5559bce06c059844269d70926b3c0b39589edb
2024-04-25 02:41:33 +00:00
Rafael Higuera Silva
36d99e8b09 Extract and fix logic for showing rac dialog.
Added tests to make sure the logic makes sense.

Bug: 335745726
Test: make, manual, atest SubscriptionUtilRoboTest, atest SubscriptionUtilTest, atest ResetNetworkTest
Change-Id: I7092f2747f1ca1f9ef4dc99275a916b9e24d8b28
2024-04-25 01:34:47 +00:00