Jason Chiu
e5fa405609
[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
am: 5d50556ce2
-s ours am: f133736e6c
-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: I4bafcdad13776f705b0a80380a06249bd88a424c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 18:27:25 +00: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
c364a011ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22480520
Change-Id: I5ec869f9ecf61f60d077179fdee7b2af99e140a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 13:59:39 +00:00
Bill Yi
10c1798572
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22480520
Change-Id: I5b53f6aa0858a2a054c342e6eb2e89db7279c544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 13:59:30 +00:00
Bill Yi
410e8ac5af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22480519
Change-Id: Icee3c3aa8fb3126890e0de521bb202c1173c1455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 13:59:28 +00:00
Bill Yi
21c40c2ef4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22480519
Change-Id: Iec465b7a3f13deb9c75eaa04999801210e027335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 13:57:29 +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
33affdae8e
Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282
Change-Id: Ic00eb13b2c51f78b528ddd4da198179047111445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 13:35:23 +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
2e82189b1a
Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214366
Change-Id: Icba9b653141d016945a5f999e1f324473d6bd1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 02:51:54 +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
1326cea122
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22437321
Change-Id: Ibbda26cecd84afdd5938309bfa247528cf8a3e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 23:38:51 +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
076cc4fc6c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I035cb268a83cfbdae6eca6c1c4b3f43306b5dc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 20:58:59 +00:00
Chalard Jean
f5747ba857
Only admin users may change private DNS settings
...
Bug: 237289258
Test: manual
Change-Id: Ia2875fb8c628642daebc48fc6aec99aaf30e64be
2023-04-03 03:27:29 +00: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
c7918b9ac3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I0c078e0ceafb27e2c05505aa140a34909dea7f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:46:13 +00:00
Bill Yi
2309f00455
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I0b507ab323bccf47d2b145c5842a18809e312215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:46:03 +00:00
Bill Yi
2a19621591
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I7c878063b45fbbc1003be421c27c6b809db10051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:45:48 +00:00
Bill Yi
107129903a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Ica28fa658d4b2992a86850c9d126585cd18c9f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:45:21 +00: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
Bonian Chen
e8b96d4b25
[Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: I2f29593b98a41fe4ced1f72dd9523be341850c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 07:32:05 +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
Treehugger Robot
06bca85c6a
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 09:34:23 +00:00
Treehugger Robot
7871a9e9bd
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I998baee786f01ee74743a02d369f8159caa89ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 09:06:29 +00:00
Treehugger Robot
60d9be5a0a
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio""
2023-03-31 08:20:36 +00: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
Patty Huang
b79d64ee90
Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"
...
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
2023-03-31 12:43:14 +08:00
TreeHugger Robot
3771564adc
Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719
Change-Id: I54ad21af66956d5711a72f587d9af4c8389a185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 01:23:13 +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
f02d69dd4f
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:04:20 +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
9cbd3bdb54
[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: bee2aa0c8b
-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: I0e68d9ee05a4b7fa0a5c38d1ac5138ae4272b2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:57:52 +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
TreeHugger Robot
1cd917c2e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Ifa057f10375fc7aca6b547d891885b432ff86724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:55:34 +00:00
Bill Yi
d87981f9a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Icf4b8a84abb39d55d9f324e9b0800aeb5876b8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:55:25 +00:00
TreeHugger Robot
32c22fa9a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Iac3c79d71dd698f8980ed4e04cf1d98788c1cca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:55:22 +00:00
Bill Yi
fc7bb1a56c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Iab62e1e02d2ac27033b90fcc15198fb855e7b13a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:54:56 +00:00
TreeHugger Robot
64aa2889d1
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I5565f72a9d96e5212b2db3b57d9978648596fba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:30:30 +00:00