Commit Graph

140019 Commits

Author SHA1 Message Date
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
Bill Yi
1e73aa2ae5 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-26 23:46:23 +00:00
Bill Yi
a4d079a542 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-26 23:46:23 +00:00
Automerger Merge Worker
a6a421978d Merge changes from topic "am-d3425663ccd1495aa73fff4f0bb394be" into main
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: fb9930eb6c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c5849b864 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d23b2221f2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50aeec824b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5c501d654a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf73c3e34e -s ours
2024-04-26 23:35:06 +00:00
Treehugger Robot
30ce935274 Merge "Update constants" into main 2024-04-26 23:31:49 +00:00
Treehugger Robot
82c313c2e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: fb9930eb6c -s ours
am skip reason: contains skip directive

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

Change-Id: I70502134ccd06d2a97a7e0f9c6988b1d042254e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:31:09 +00:00
Bill Yi
4b2017d4c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c5849b864 -s ours
am skip reason: contains skip directive

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

Change-Id: I374ac88e64c76a61753c1a20fc08ececf8af228a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:31:06 +00:00
Treehugger Robot
8416e8a98f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d23b2221f2 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie69a9e360e95c7ecb02d59c4b8bcbb8c48093733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:31:02 +00:00
Bill Yi
91c8152426 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50aeec824b -s ours
am skip reason: contains skip directive

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

Change-Id: Id093659d38704fa1a617e77555a347dbbd5c32f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:30:52 +00:00
Treehugger Robot
aac87f5ba5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5c501d654a -s ours
am skip reason: contains skip directive

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

Change-Id: Iec9a6070b3ab9a311e0c50b5c3d182cddd0f1cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:30:45 +00:00
Bill Yi
8b9fa582b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf73c3e34e -s ours
am skip reason: contains skip directive

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

Change-Id: Iac0cbea49c55dd55160a5b612f06c829f8239047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:30:41 +00:00
Treehugger Robot
2f70cc72c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 962fd16b95 -s ours
am skip reason: contains skip directive

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

Change-Id: I86f30229227422b90d850d6bb2308de59ec2052a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:16:09 +00:00
Bill Yi
8074d96478 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c594852361 -s ours
am skip reason: contains skip directive

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

Change-Id: I6cf0a23ad3818aabd50273c26fe2ee74d098ab04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:16:05 +00:00
Bill Yi
f767805ce6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d0305f4d9 -s ours
am skip reason: contains skip directive

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

Change-Id: I84745c6222530e57bcd7b1cafd15c31ea4e5d50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:14:59 +00:00
Treehugger Robot
962fd16b95 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-04-26 23:03:43 +00:00
Treehugger Robot
fb9930eb6c Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-26 22:58:49 +00:00
Treehugger Robot
d23b2221f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-26 22:58:49 +00:00
Treehugger Robot
5c501d654a Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-26 22:58: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
Emilian Peev
c531fbd07f Settings: Replace EFV strings with Night, HDR extensions
Switch the SW extension fallback toggle message from
EFV to Night & HDR instead.

Bug: 333884140
Test: Successful build
Change-Id: Iad121b1edb19c502581640aa2911854e37b4bc06
2024-04-26 20:17:24 +00:00
Song Chun Fan
cec07fa4d4 Merge "[Settings] Remove REQUEST_INSTALL_PACKAGES from manifest" into main 2024-04-26 17:12:23 +00:00
Jeff DeCew
b56c6b1710 Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main 2024-04-26 13:45:25 +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