Presubmit Automerger Backend
128d5ad006
[automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I4fbb2409a9dd9ef9ad9eef90b135d4ac50636c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:34:45 +00:00
Lin Yuan
5b0617f569
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev
2022-06-02 19:59:26 +00:00
TreeHugger Robot
e6ee0ba1ca
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: b2a6f3b640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I38e251a90df0d85b02e4a90e60434374caebb43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 10:56:20 +00:00
TreeHugger Robot
b2a6f3b640
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Iea8346aa727c8ca1b9ccf7511e4c360c559c94c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:40:00 +00:00
TreeHugger Robot
2e68c87afc
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I8d59841265494fc6b1e1b280c6c275c4103959be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:13:52 +00:00
TreeHugger Robot
165c11c0da
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I808a8ab16e700325ec93b028e22a58215fbdbbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:58:27 +00:00
TreeHugger Robot
6fd7cf1993
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I6c7835e9885cf02ba167a8f4ac1c564bad511e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:34:09 +00:00
TreeHugger Robot
e3bbadb7df
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:15:36 +00:00
TreeHugger Robot
2f184b0ff4
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev
2022-06-02 06:52:53 +00:00
TreeHugger Robot
9d995e75a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-01 23:22:20 +00:00
Lin Yuan
a12fff673b
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58 )
2022-06-01 10:53:49 +00:00
Bill Yi
a3d586794b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5c20332cf35d47975bb187aa64db2045acaebd3
2022-06-01 03:47:38 -07:00
Bill Yi
3466df0415
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c0c9eb87ae757d27c2917878e21cb2a7b3bc217
2022-06-01 03:43:59 -07:00
Presubmit Automerger Backend
b7ebd6e3a3
[automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Bug: 228315522
Bug: 228315529
Change-Id: I8a81fa13e357a7c32a1dde49e0e14fab176ad0fb
2022-06-01 10:37:14 +00:00
Lin Yuan
2598a722ae
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58 )
2022-06-01 10:37:04 +00:00
TreeHugger Robot
a39043d1ab
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-23 18:42:17 +00:00
Bill Yi
0c0b16955b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f6bcb27ceabafc988752c5f988519bc1217f121
2022-05-20 07:21:29 -07:00
Bill Yi
70a7ba0f71
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice7a5337a3736a6fba30fd25ea1adfcdcad9dc75
2022-05-20 07:02:12 -07:00
Bill Yi
0aaa6d1154
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9ec4145b47950134a508ff097af5ecf68d5b19d
2022-05-16 22:10:20 -07:00
Hugh Chen
40ed71c895
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: I9aea03a94b613a948fb141d709a3f59aafc1b047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 21:32:31 +00:00
Hugh Chen
136af4e593
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: I6b82d1d82654386eeb76efc977d4dc6abfd7e627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 21:06:42 +00:00
Hugh Chen
8ce854af29
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: Ia756b506704aa52e74946365db61e75d807ec38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 20:44:25 +00:00
Hugh Chen
ddc8e16cd6
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692
Change-Id: I2974cc1f7229b3fb1dc1a102622fd51f99cce71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 20:18:09 +00:00
Hugh Chen
3d0db8d34f
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691
Change-Id: Ib3757ce8331bca132fac28ef4c07ee67c1949379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 20:18:03 +00:00
Hugh Chen
22ce749aa6
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: I7c6a9f85f48ac5a5ccf4eeeb05d90e55c1744ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 20:16:32 +00:00
Hugh Chen
f13ceb8aea
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692
Change-Id: I2bf3cc43e484dd321a2fbc88e8cce5c4e3f74099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 19:58:27 +00:00
Hugh Chen
dc1023e587
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691
Change-Id: I5647f69523610c0596b7d58087609b3a50ca59f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 19:58:22 +00:00
Hugh Chen
8ddd1d70b2
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: Idb833457913af76144b1130b7c83558680ba8b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 19:58:05 +00:00
TreeHugger Robot
e26317b97c
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689
Change-Id: I0999aa18fd2eafee129ec5e22ad5fc4c411d2a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:23:52 +00:00
Hugh Chen
e178179a9e
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689
Change-Id: I9b5f85e564f46279e0b8413571409ea7d885bc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:23:50 +00:00
Hugh Chen
a2d6c9a087
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 23ab123ba7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: Iace915bd93f479580c597fea6050a545108a8229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:23:43 +00:00
Hugh Chen
8d4a4b690f
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692
Change-Id: Id1e850102f51868de0c30f3a39fdebc0e32ebac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:38 +00:00
Hugh Chen
1e636ad03e
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691
Change-Id: I190fec06a23bb24407397976630dd49dd6709c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:31 +00:00
Hugh Chen
c2bb599eeb
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: Ic3eecbf76413c2ceeff1f3a838cb7f6250e3a423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:30 +00:00
Hugh Chen
d925f52768
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692
Change-Id: I96f41ff4642edd74d529102f2ba09bfb0a1a1044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:19 +00:00
TreeHugger Robot
20457ad117
Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev
2022-05-16 17:08:57 +00:00
TreeHugger Robot
c8603dabf2
Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev
2022-05-16 17:08:55 +00:00
TreeHugger Robot
12a30b9511
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-16 13:35:19 +00:00
Bill Yi
d941a36042
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I72edb933db44f747ddd3c5c88e5e3569cd3aa292
2022-05-15 10:28:30 -07:00
Bill Yi
1c8b7a9fe8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I84adbff328986322454db3a886462ebdbbfaf648
2022-05-15 10:24:59 -07:00
Hugh Chen
06139d3ffc
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2 )
2022-05-12 06:20:57 +00:00
Hugh Chen
c44b6fed73
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2 )
2022-05-12 06:18:59 +00:00
Hugh Chen
9399a699d7
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2 )
2022-05-12 06:16:53 +00:00
Hugh Chen
23ab123ba7
[automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Bug: 228450811
Change-Id: I8e1ee6a97b57934b553a962f8f459d3f6afd746e
2022-05-12 06:14:37 +00:00
Hugh Chen
1c4142e1ae
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2 )
2022-05-12 06:14:27 +00:00
Hugh Chen
663066691e
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2 )
2022-05-12 06:13:00 +00:00
Hugh Chen
8bae222489
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2 )
2022-05-12 06:11:48 +00:00
Arc Wang
a1bc77f4a4
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: I8f39c1878d2c6e4acac80a187cae03fc551711bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 02:33:12 +00:00
Arc Wang
4daf31225d
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Id9d6ac8dba6e7e553207977138cf080dbd6dab53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 02:07:21 +00:00
Arc Wang
09c382d878
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Ibe47e367afe145e51e985c43ba64786ea980a9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 01:43:25 +00:00