Pawan Wagh
569313f809
Merge "Set 16K dev option as checked by default for 16KB page size" into main am: 4c647972fe
am: 07f71333bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3053444
Change-Id: Ic5a19b725b60cc466eba2879b50cdb7b2711bdfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-30 04:20:46 +00:00
Pawan Wagh
07f71333bc
Merge "Set 16K dev option as checked by default for 16KB page size" into main am: 4c647972fe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3053444
Change-Id: I17006093b2505056becde9efd2e4ccca3d76b4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-30 03:47:37 +00:00
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
Chaohui Wang
f97e76bc3f
Fix SubscriptionInfoListViewModelTest
...
Fix: 329160337
Test: unit test
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
(cherry picked from commit 10f5bdabb4
)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
2024-04-30 03:32:08 +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
Treehugger Robot
874072f2df
[automerger skipped] Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev am: c81e0cb16a
-s ours
...
am skip reason: Merged-In Iff40c1fb9a2463311768d24d09dfc3aeeee128f9 with SHA-1 1331449353
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27116872
Change-Id: Ide5d09321c0a04828409c261757db0894f51e725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-29 22:49:13 +00:00
Meng Wang
2998d4c93f
[automerger skipped] When erasing an eSIM, verify the device screen PIN lock if one is set. am: bcf91ee6a7
-s ours
...
am skip reason: Merged-In Iff40c1fb9a2463311768d24d09dfc3aeeee128f9 with SHA-1 1331449353
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27116872
Change-Id: Ib6f970f14d83ccb96a061b6fee599e0a7ae017b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-29 22:49:08 +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
Bill Yi
89a8164090
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-29 18:54:41 +00:00
Bill Yi
2e900b9ddb
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-29 18:54:41 +00:00
Bill Yi
2025ab7323
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-29 18:54:41 +00:00
Bill Yi
dd0156bd7c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 058348474d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27136143
Change-Id: I523e1f183bd069dbe5e164cd52194d37e7afe9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-29 17:28:30 +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
Treehugger Robot
e174766e2d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 9d689ab23d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27138658
Change-Id: Idd0f3cebf97db84b725e215ffe0a382e34df4e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-29 16:44:41 +00:00
Bill Yi
9294b46e04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98a0240922
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27138658
Change-Id: If12a8e0954cb974a7f85ca4bad3503396dbda392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-29 16:44:35 +00:00
Treehugger Robot
3cd0026f4e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 843206759f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27136145
Change-Id: Id39654e4984ea8b06e276ce57f0a0f5509bf0994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-29 16:44:30 +00:00
Bill Yi
379b972106
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67a07a4f9c
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27136145
Change-Id: Ib49d82d471ce155d45ee131c426d06f6f310652e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-29 16:44:17 +00:00
Jason Chang
51ee749d93
Merge "Fix the text under the "Setup for limited vision or head motion" is grayed out" into main
2024-04-29 16:32:43 +00:00
Treehugger Robot
9d689ab23d
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-29 16:32:33 +00:00
Treehugger Robot
843206759f
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-29 16:32:33 +00:00
Emilian Peev
114ebb5fec
Merge "Settings: Replace EFV strings with Night, HDR extensions" into main
2024-04-29 16:18:50 +00: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
Bill Yi
98a0240922
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5a7aff183dd5dffd3c710a45d6ee94f170bc29d6
2024-04-28 19:48:11 -07:00
Bill Yi
6a4f06cead
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I988fb2ebde087ed0bfedddbe582555a3ed5503eb
2024-04-28 19:47:02 -07:00
Bill Yi
67a07a4f9c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I88805c3d04f777c05488ebcc8f9ae050650a95f0
2024-04-28 19:44:13 -07:00
Bill Yi
9bc6bb3e9f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic630cf9ddcb165f7597f226109c2dd08e8e6a2de
2024-04-28 19:42:05 -07:00
Bill Yi
c6603280b5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e9b33d37226e8abb9a6988c6f11e8008e84cc03
2024-04-28 19:39:15 -07:00
Bill Yi
058348474d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac6ff76b8df06e6ea3037acc1b0d0ff8a4db3a29
2024-04-28 19:37:08 -07:00
Fan Wu
ada799e155
Update test looper mode to INSTRUMENTATION
...
Bug: 337171922
Test: atest
Change-Id: Ifb02a3be4e91383a3c1d9b8fe598aa50a8d877f9
2024-04-28 07:55:34 +00:00