Bill Yi
c7550f62e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5cbdfde1f4c34ad1d233e79f9b1464679d12bf3d
2023-04-10 23:59:36 -07:00
Bill Yi
a568dc677b
Import translations. DO NOT MERGE ANYWHERE
...
BUG:271250248
Auto-generated-cl: translation import
Change-Id: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
2023-04-06 20:54:16 -07:00
Jason Chiu
f133736e6c
[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
am: 5d50556ce2
-s ours
...
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22505800
Change-Id: If85b58dac4614b53683b7718ea5e6ed3db2fdd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 18:00:33 +00:00
Bill Yi
aca33b33aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-06 13:50:19 +00:00
Bill Yi
3cc4247a1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-06 13:50:19 +00:00
TreeHugger Robot
cb00b2bd0c
Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev
2023-04-06 13:07:13 +00:00
Jason Chiu
5d50556ce2
[resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906
Bug: 277168213
Change-Id: I35125125776e350ae7fce5feac4a387868fac7af
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 10:21:27 +00:00
Jason Chiu
0f13f70655
Refine permission check process of 2-pane deep link
...
- Check the deep link activity instance before redirecting to the
internal activity for the managed profile invocation, so the caller
can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
new caller and check if it has a permission to open the target page.
Test: robotest & manual
Bug: 268193384
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-04-06 04:23:01 +00:00
Jason Chiu
d0b0aeb2ba
Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev
2023-04-06 02:24:16 +00:00
Jason Chiu
4f7205b2ea
Refine permission check process of 2-pane deep link
...
- Check the deep link activity instance before redirecting to the
internal activity for the managed profile invocation, so the caller
can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
new caller and check if it has a permission to open the target page.
Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-04-06 02:22:45 +00:00
Bill Yi
a5ef604de7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibda77f75cc4865437dd8dc5f52260b62b9d6f00b
2023-04-05 18:05:09 -07:00
Bill Yi
37114bb2b0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4b1f4ec2b736b8123de1ee218b367083163d737e
2023-04-05 18:03:09 -07:00
Prabal Singh
a53a89d370
Add "for work" in work profile biometrics string
...
JUSTIFICATION: Around 8 users reporting this issue in b/271250248
RISK: This change is a cherrypick from a fix already made in Android U where no issue has been reported after a few months.
Bug: 271250248
Test: manually tested
Change-Id: Ib16b2d045f4695883276749fcce6ccce60688c09
(cherry picked from commit a9231555e4
)
2023-04-05 17:16:22 +00:00
Bill Yi
fa4e2c72af
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia388647234a08b6a569c4fb853ae6702eba75927
2023-04-03 15:43:43 -07:00
Bill Yi
179fdda8d3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9687e3f6e8e0adb69d87cedd36926f91f0fd732c
2023-04-02 17:52:31 -07:00
Bill Yi
a3af1db910
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-02 18:22:50 +00:00
Bill Yi
f884a037be
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-02 18:22:50 +00:00
Bill Yi
a2f4c8bd49
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5e4ab0bbea59e5f05353776da8d5ae625767d93
2023-03-31 17:03:07 -07:00
Bill Yi
5847bd476f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9609f118fd4a653fd4a5a62fe786691d489e1d83
2023-03-31 16:56:15 -07:00
Bonian Chen
61e6c46fa7
[Settings] Avoid from user without sufficient permission to change WiFi
...
calling
Enhance security control through close UI when accessing by user with
restriction.
Bug: 262390632
Bug: 262243015
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSettingsTest
Change-Id: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
(cherry picked from commit a1d3fe061e
)
Merged-In: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
2023-03-31 08:15:45 +00:00
TreeHugger Robot
0362083f3a
Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev
2023-03-31 00:20:15 +00:00
TreeHugger Robot
5bde972e4e
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev
2023-03-30 19:08:44 +00:00
Julia Reynolds
bee2aa0c8b
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours am: 2a66721ccf
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I963414b8f0ab062e653ef5d4840d0c048f984144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:10:42 +00:00
Julia Reynolds
2a66721ccf
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie50619f573b47b5998b52d2933465e09397124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:37:28 +00:00
Julia Reynolds
e4ce644bfe
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I760d7d641cc26d9d640c3504414a16a26d70bc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:57:36 +00:00
Julia Reynolds
684952a8b0
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ic239b938c957b82b8eb072ba55b34ab9388a24af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:25:15 +00:00
TreeHugger Robot
36e511b35e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-29 22:22:14 +00:00
TreeHugger Robot
5be8078ec1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-29 22:22:14 +00:00
TreeHugger Robot
b6399c95b3
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev
2023-03-29 19:52:27 +00:00
TreeHugger Robot
23c17977fb
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev
2023-03-29 19:51:37 +00:00
Julia Reynolds
85c25d29d7
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8124bdb6668bc43f275489abb311994ea69645db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:58:46 +00:00
Julia Reynolds
cfacc2acb8
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie11a802db36591d58289cd82956c5205f0893244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:28:40 +00:00
Julia Reynolds
8befc27425
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8d1fa61e9c43c711725505554b464697f1f1ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 15:56:56 +00:00
Weng Su
6e79778d3c
Restrict DataUsageList for guest user
...
- Don't show DataUsageList if the user is a guest
Bug: 262741858
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: Id877c2235c6a65683f2d0a0ba381dffba4dd95b8
2023-03-29 21:44:55 +08:00
Weng Su
3abf4d9d5f
Restrict DataUsageSummary for guest user
...
- Don't show DataUsageSummary if the user is a guest
Bug: 262243574
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Change-Id: I94d0fd18a81dc0f0adba544340e648d58c5d3358
2023-03-29 18:12:44 +08:00
Bill Yi
bc45b9f125
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If406f25ee072b3c2a778d2e007abecc99f06caf6
2023-03-28 17:58:08 -07:00
Bill Yi
113326ed83
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I278cdc816710d5eb2cf8fa3997d55aee0e3efa73
2023-03-28 17:54:17 -07:00
Julia Reynolds
812747f662
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours am: 82fcfa8da0
-s ours am: 40bec70af8
-s ours am: f1bd633fec
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I16d62672bad5e2fe6f7a392355f05d32eb7df2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 22:35:17 +00:00
Julia Reynolds
f1bd633fec
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours am: 82fcfa8da0
-s ours am: 40bec70af8
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I3f18d0dfa27c9b8efd19e9f551605f7ff345c145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 22:01:10 +00:00
Julia Reynolds
40bec70af8
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours am: 82fcfa8da0
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I0c3f8af192ffa31af66955a27ef870122a04ce4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 21:46:08 +00:00
Julia Reynolds
82fcfa8da0
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 21:16:39 +00:00
Julia Reynolds
7c9190d25a
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:43:18 +00:00
Julia Reynolds
ceb2d0400a
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:25:32 +00:00
Julia Reynolds
135489a1d9
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours am: acb5e90d5d
-s ours am: 7594f2deea
-s ours am: 94ef1c333f
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: I53e932f4ab8997535abe729eb36d816c40b9145a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:14:52 +00:00
Julia Reynolds
94ef1c333f
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours am: acb5e90d5d
-s ours am: 7594f2deea
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: Ie295579d5360bdd8b35232e2233f8f572563357e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:46:09 +00:00
Weng Su
cc53f44d49
Revert "Disallow screenshot on Wi-Fi QR code settings"
...
This reverts commit 950837b20f
.
Reason for revert: The security issue is downgraded to NSI, remove the screenshot protection to rollback the original design.
Change-Id: Iecaf7e4e19dc3452a7d2aeaf32bf38619e760c76
2023-03-28 19:30:11 +00:00
Julia Reynolds
7594f2deea
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours am: acb5e90d5d
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: I22fe2da8599d3a5b002f6c145a15e71ed06634e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:20:42 +00:00
Julia Reynolds
acb5e90d5d
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: I844c70ca3340a3800ca2b88b55094fdb9f111635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:08:05 +00:00
Julia Reynolds
cbb6811219
[automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
...
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:07 +00:00