Lin Yuan
db2ea2bcbd
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18690005
Change-Id: I3ec9011a5e3bd003773ccb1faffe324f54630ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:32:58 +00:00
Bill Yi
8f7ce798e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic884cd038873ee7aaa8468e81fb1c07408dcc251
2022-06-02 13:29:41 -07:00
Bill Yi
0f02336db9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5af54bdbbb4c33a228efbadfc95a72cd06e3c4f
2022-06-02 13:26:34 -07:00
Bill Yi
c9d17d7191
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia17562a54d6c2fd54cc34c1e4b08cb6d02c69dcb
2022-06-02 13:22:44 -07: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
0920be7e46
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev
...
* 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
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
Lin Yuan
6ffe64a0a9
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev
2022-06-02 19:59:07 +00:00
TreeHugger Robot
d7fcc775e5
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
am: e6ee0ba1ca
am: 1ef5a1c86a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Ie3454fc7d19ab078f4c07038eb8132c6e136171c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:35:08 +00:00
TreeHugger Robot
1ef5a1c86a
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
am: e6ee0ba1ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Idd1b1e42bacbb74d950d9aa9a367b0f3a9fe176c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 11:18:16 +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
5d47633192
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: If2a0f2689e3926da7ab3104ef2e6e25e7fd5b5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:02:26 +00:00
Bill Yi
f52d81e8cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693629
Change-Id: I105bce0dac4f64afb5953259df915d4d4782492a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:02:09 +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
2dd22a060a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-02 06:41:58 +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
Tsung-Mao Fang
0e5c208a4f
[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:53:18 +08: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
Tsung-Mao Fang
90968c8437
[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:20:38 +08:00
Arc Wang
46e00dc6df
[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 10:17:47 +08:00
TreeHugger Robot
f198f55543
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-06-02 01:56:17 +00:00
TreeHugger Robot
4a8654a687
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-06-02 01:56:17 +00: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
73985c8296
[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:49:30 +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
TreeHugger Robot
d3fa68ae4c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7
-s ours am: 34534c87b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: I22a44858160dfad39cd1d2d08a446d7dfb752d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 00:16:23 +00:00
Bill Yi
62df895260
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b
-s ours am: 95fef514c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: Ia094859f349e3f892798c3e6b6a1fa1b369b5b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 00:16:04 +00:00
TreeHugger Robot
34534c87b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: I1b8c9672581e4ee6fbf0533626d25f702a5c8e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:51:01 +00:00
Bill Yi
95fef514c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280
Change-Id: I1a14edab2cb0cc8d0878cc0a0195db8b8ae816c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:50:35 +00:00
TreeHugger Robot
9d995e75a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-01 23:22:20 +00:00
Bill Yi
3c0f379808
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415
-s ours am: 6620ba750b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696259
Change-Id: I0534b3748f0a99697af81088d8cb32843865d8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 23:04:11 +00:00
Bill Yi
6620ba750b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696259
Change-Id: I30af08bada2f825641e1dc015b753bd242b63315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 22:40:56 +00: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
ccb5c5f102
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: Ib4d436259f29de4248b52f43ac012ae9f6820b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:31 +00:00
Bill Yi
24666f139a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693929
Change-Id: I711ed0b34e16ac5dfc8d05afd3133ffa38badc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:49:30 +00:00
TreeHugger Robot
c705beea0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-01 19:23:59 +00:00
Joshua Mccloskey
63074bf020
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I62f4a5a26df327ffa753c81465e5b45d738e7b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:53:43 +00:00
Joshua Mccloskey
14a5aded8f
Merge "Ensure lottie animations are not empty." into tm-dev
2022-06-01 18:02:39 +00:00
Chaohui Wang
c8218514f2
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I19ed2d32594c8c61733cc033fb38c6fd3b9629ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:38:12 +00:00