Lin Yuan
c24add0997
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours am: 9d3371ee23
-s ours am: aeab9be2c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: Ia8ef1d36e8b820813e707067099bba518cbd532c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:24:06 +00:00
Lin Yuan
8e637809fd
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
am: 95d21bc12f
-s ours am: 18c00007b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I78cb63110e110c07b1f4df1a021fe7073b91e7ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:07:39 +00:00
Lin Yuan
afc61aa166
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
am: d78ed7aa73
-s ours am: 36b5a2c8d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I153f795485779cdac56aef46ac0b40091979ac05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:07:37 +00:00
Lin Yuan
686679749b
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours am: 02ca401236
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I86a9c8a3b175a0ea3b3bec1bb7944c98c0b965f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:06:42 +00:00
Lin Yuan
aeab9be2c3
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours am: 9d3371ee23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I6034dd98bb748d2045b2bf50e35931e6f0bb0186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:06:40 +00:00
Lin Yuan
18c00007b7
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
am: 95d21bc12f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: If27537456da8f42e9b0384c5b72e884b1afbc68c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:28 +00:00
Lin Yuan
36b5a2c8d3
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
am: d78ed7aa73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I33890f4ba7d155d21551aee115257c788997b065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:26 +00:00
Lin Yuan
02ca401236
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I60fb0e9e0c915cf5dd4441939efe462a53b3683b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:24 +00:00
Lin Yuan
9d3371ee23
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I2eafef534fcd1662ca91d499fc1751b98e34fa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:20 +00:00
Lin Yuan
1e45df2451
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: Iec14adb488a174788965c941d1f688524959b9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:34:00 +00:00
Lin Yuan
36069908ce
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I5e3c940b4dda8b6b6802c2c49260bbad1e661372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:50 +00:00
Lin Yuan
4daf65ea3b
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I879d097018e3d4f99d9a8e9f788820a0729d8b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:48 +00:00
Lin Yuan
95d21bc12f
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I6fdfb9076352a14d139425965fd091a70b7c4f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:00 +00:00
Lin Yuan
d78ed7aa73
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I1d6ccb2b76503875626f5422db30b90442114f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:32:59 +00:00
Lin Yuan
d765af048a
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev
2022-06-02 19:59:49 +00:00
Lin Yuan
3a95e552c6
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev
2022-06-02 19:59:42 +00:00
Lin Yuan
97c15312fa
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev
2022-06-02 19:59:35 +00:00
Lin Yuan
10b5ab82f5
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod
...
* changes:
[automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
2022-06-02 19:59:35 +00:00
TreeHugger Robot
295de2209f
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: I53ee69ae4b1564444d04aa8e8be5e1fe8a4d6421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:39:01 +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
Tsung-Mao Fang
edf4416177
[DO NOT MERGE] Fix can't change notification sound for work profile.
...
Use correct user id context to query the type,
so we won't get empty result unexpectedly.
If we get the null result, then we won't set sound sucessfully.
Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-06-02 10:57:50 +08:00
Tsung-Mao Fang
32145cc362
[DO NOT MERGE] Fix can't change notification sound for work profile.
...
Use correct user id context to query the type,
so we won't get empty result unexpectedly.
If we get the null result, then we won't set sound sucessfully.
Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-06-02 10:55:47 +08:00
Tsung-Mao Fang
0eb3011fc2
[DO NOT MERGE] Fix can't change notification sound for work profile.
...
Use correct user id context to query the type,
so we won't get empty result unexpectedly.
If we get the null result, then we won't set sound sucessfully.
Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-06-02 10:54:19 +08:00
Presubmit Automerger Backend
03dd4cc7d2
[automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595
Bug: 232502532
Bug: 221041256
Change-Id: Ibc32353ed93fd1f1f053066294b375c6cbd101ae
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 02:53:24 +00:00
Tsung-Mao Fang
0d8d05a221
[DO NOT MERGE] Fix can't change notification sound for work profile.
...
Use correct user id context to query the type,
so we won't get empty result unexpectedly.
If we get the null result, then we won't set sound sucessfully.
Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-06-02 10:29:53 +08:00
Arc Wang
d94b73b304
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:52:17 +08:00
Arc Wang
973a46134b
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:51:42 +08:00
Arc Wang
e3134c4a04
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:51:05 +08:00
Arc Wang
67b9fb57ea
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
...
Ringtone picker may callback a null ringtone Uri
if users select None.
This change pass null ringtone Uri to RingtoneManager
and return.
Bug: 232502532
Bug: 221041256
Test: maunal
Settings - Sound & Vibration -> Phone ringtone
-> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
2022-06-02 09:48:26 +08:00
Raphael Kim
8d749c55f4
Extract app label from component name in notification access confirmation UI
...
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
Merged-In: I8613d9b87a53d4641c0689bca9c961c66a2e9415
2022-06-01 22:24:39 +00:00
TreeHugger Robot
a3be04c95d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-01 17:51:21 +00:00
Lin Yuan
78799a550a
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: https://screenshot.googleplex.com/AqvEW2kTrQT2Ufp
Bug: 228315522
Bug: 228315529
Test: manually on sunfish flashed with rvc.
Change-Id: I6ef64a34764e52de7b461e87ea0af40a6d050587
2022-06-01 07:17:47 -04:00
Presubmit Automerger Backend
a31031e5bb
[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: I704dc294544543108bd9ba1fc4a10eb3e99e5d4a
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
Bill Yi
87a8b49ca0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I57f1a9aab938cdc0e363e835460ccffbf79d97d6
2022-05-31 23:52:36 -07:00
Bill Yi
3dea4314ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifd21d97003c44e3e95ed191fd691e0a8e2042092
2022-05-31 23:47:37 -07:00
Lin Yuan
9eff8f7a8d
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: https://screenshot.googleplex.com/49nR5HQ8g5bgNVq
Bug: 228315522
Bug: 228315529
Test: on device
Change-Id: I92b22567011c32f0874bcecb3898ef678bb549a1
2022-05-31 21:51:40 -04:00
TreeHugger Robot
138ee00007
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-23 18:50:09 +00:00
Bill Yi
0fc6315b65
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I70f0d00ed8fe7c13e0065a1a5f435a7a361a6b93
2022-05-20 06:48:09 -07:00
Bill Yi
ca3a25c900
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id69c2a43ac584d2e7f6cf9a5889884f7e5707127
2022-05-20 06:43:01 -07:00
Bill Yi
6424f8d388
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6deba52bc684476e3468232e40066ca1880efa85
2022-05-16 21:37:39 -07:00
Hugh Chen
5124046494
[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: I3b004844db43ddf86e3764cade511f330680d5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 21:05: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
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
b71cc3b9fd
[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: Ief2f7a4f3bb5ed1428184db78fc5db8c80fc51d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 19:59:15 +00:00
Hugh Chen
7bde548ee0
[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: I9df2aef9a0ac12de54a0db3d82186e9dbafc0f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 19:59:08 +00:00