Commit Graph

110815 Commits

Author SHA1 Message Date
Tsung-Mao Fang
3ad83e8fa3 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 90968c8437 -s ours am: d029dbf666 -s ours am: 79b30450be -s ours am: 819635809c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: I06b111b5af06e10cd110c562ff6067db34f8c6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:37:30 +00:00
Raphael Kim
cd9074d621 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67 -s ours am: ff7f705e3e -s ours am: 23cae804fa -s ours am: 0dc51dd967 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: If0a250e3b0d452c191881cb99b65d5a33d2b80ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:36:29 +00:00
Raphael Kim
214aeb14e0 [automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5 -s ours am: e4a98fbbb7 -s ours am: 07be60a7f0 -s ours am: 386af8fa0b -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I223e7c644c803fb17e46eaded59137691c23e3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:36:27 +00:00
Raphael Kim
bd2c0f9b85 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67 -s ours am: ff7f705e3e -s ours am: 23cae804fa -s ours am: afe35375f2 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I22b2f4c75ca2467e60309eafd58ba39380a29c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:56 +00:00
Raphael Kim
b97fe5c26f [automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5 -s ours am: e4a98fbbb7 -s ours am: 07be60a7f0 -s ours am: e10c865da0 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: Id01b5c3679f65a35910147f8b16a3f011ccbf2c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:54 +00:00
Arc Wang
ab3adbd4dd [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: I6a43ef0a5d3be0ccea94ff04b6ef83bca00981b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:34 +00:00
Tsung-Mao Fang
2e3f8a30a1 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: Ied5f7df1a6f1e1f53a07dadcd828d8042a677c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:32 +00:00
Arc Wang
4129c273cc [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598

Change-Id: Ia6a7f76c885e08cbf388bbd912b08f481ae23575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:29 +00:00
Raphael Kim
e317ddfda6 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67 -s ours am: ff7f705e3e -s ours am: b8c14b8752 -s ours am: 535980f3c7 -s ours am: 75c7de0fc4 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: Ia5f0de693232eddda0c3ef89d22253fbbd457f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:18:57 +00:00
Raphael Kim
b8b37b52f1 [automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5 -s ours am: e4a98fbbb7 -s ours am: f11acd30cf -s ours am: c5b6e58106 -s ours am: f14418c5f0 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I867e97764dbe869ea6a80920a90220539ab8d768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:18:55 +00:00
Arc Wang
f7dac28d6c [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: 1e840598ed -s ours am: 6e3b0189b0 -s ours am: a568b504d8 -s ours am: 7541807566 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I0a12cadfc7f4d44fdcf5e872c016aec346a3285f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:16:36 +00:00
Tsung-Mao Fang
173c6d2bc5 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ddc4cbe128 -s ours am: 8ba2996c1e -s ours am: 6798bdac09 -s ours am: f93e140bb0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I92add9c27101e9a2c532107758c2bb07edf34b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:16:35 +00:00
Arc Wang
fc4508f9e6 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 72437e7d60 -s ours am: 49ce605299 -s ours am: a942fc2f5b -s ours am: a21406b20a -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I6ca3c529702f89dc1d830bf213a7aa3c4f618aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:15:45 +00:00
Tsung-Mao Fang
5e6791c5de [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: 52a571f239 -s ours am: 86b1ff3584 -s ours am: 0d51854ff2 -s ours am: 62b8cd91b5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: Id734bfad0687546026c731a5d415c76e0283ec78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:15:44 +00:00
Arc Wang
b9bdf5815e [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: 1e840598ed -s ours am: 6e3b0189b0 -s ours am: a568b504d8 -s ours am: 4c445bf10f -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I1dacd9d0f65620b924874eb93555d6c0425695a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:15:12 +00:00
Tsung-Mao Fang
c36f0417eb [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ddc4cbe128 -s ours am: 8ba2996c1e -s ours am: 6798bdac09 -s ours am: 61bc072fcd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I5024fe4b0ef483ccd70d423fe621b46fc8787b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:15:11 +00:00
Automerger Merge Worker
7b5acf7cdd Merge changes from topic "am-6c3e7fc607f1452d9118f418d44cf6b6" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: b5e5c80038 -s ours
  [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: 3f4c9a480e -s ours
2022-06-04 01:15:02 +00:00
Arc Wang
f4b4c33d16 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 72437e7d60 -s ours am: 49ce605299 -s ours am: a942fc2f5b -s ours am: bb52645cd7 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: Ie6e26a5158348ebcce8180cef7dbc6a431e8d1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:15:00 +00:00
Tsung-Mao Fang
1d2bdc631b [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: 52a571f239 -s ours am: 86b1ff3584 -s ours am: 0d51854ff2 -s ours am: 8c03b2d4db -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I7cfa4d0742ca93a0bdb8f8c758a89185f8094a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:59 +00:00
Arc Wang
9a80160223 [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: b5e5c80038 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I74f6d316f8ae2ebda561862269e0a23b299d7e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:58 +00:00
Arc Wang
b68d21e001 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: 1e840598ed -s ours am: 6e3b0189b0 -s ours am: a568b504d8 -s ours am: 2e70386b3d -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: Ib9652559cc61eac489ed78bc8bfe74ad1366aefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:58 +00:00
Tsung-Mao Fang
00271a53d3 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: 3f4c9a480e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: Ib7ef2994fdcb67c243fed04a31ba4470c0e906d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:58 +00:00
Tsung-Mao Fang
8938fb5914 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ddc4cbe128 -s ours am: 8ba2996c1e -s ours am: 6798bdac09 -s ours am: 4a38992eea -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I263ebcab607091881a63217fde066f532775cb04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:57 +00:00
Arc Wang
85122bffda [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: 1e840598ed -s ours am: 6e3b0189b0 -s ours am: a568b504d8 -s ours am: 2e70386b3d -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: Icfd8851c941cc094a7dfed1181b9202b00223d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:51 +00:00
Tsung-Mao Fang
5dcde87d87 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ddc4cbe128 -s ours am: 8ba2996c1e -s ours am: 6798bdac09 -s ours am: 4a38992eea -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: Ie0f8ef1dbef31912fd9340ef024566ea72156c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:50 +00:00
Arc Wang
7ca4462df8 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 72437e7d60 -s ours am: 49ce605299 -s ours am: a942fc2f5b -s ours am: 2d39ef425c -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I3d946b7a6856255974581b1a62a10e04948e43a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:47 +00:00
Tsung-Mao Fang
8b0f218a41 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: 52a571f239 -s ours am: 86b1ff3584 -s ours am: 0d51854ff2 -s ours am: d76d5d2847 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I294ab0d4e7831603d04549fb7fd8e548aa0b0e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:46 +00:00
Arc Wang
96491e4b52 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 72437e7d60 -s ours am: 49ce605299 -s ours am: a942fc2f5b -s ours am: 2d39ef425c -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I91bba69ca23d655b9d3c5c9099db3bd77eadaa3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:41 +00:00
Tsung-Mao Fang
6542e2c009 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: 52a571f239 -s ours am: 86b1ff3584 -s ours am: 0d51854ff2 -s ours am: d76d5d2847 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: Ia29cb83c22c130b324ce60a302f2a8a3501dd62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:40 +00:00
Arc Wang
649676228a [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: 4fcb75175f -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I224e0ebf29dc632368843491d2fc929de767f17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:37 +00:00
Arc Wang
71c5b833c6 [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: d5e8227b11 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I04989b77394039942b70b55f8abac3647f3e57bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:37 +00:00
Tsung-Mao Fang
fe69402b1a [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: e07ccd7278 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I316069e3f4fff39b98e7c22e59afdc599d1b8cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:36 +00:00
Tsung-Mao Fang
fdd9e7fd9f [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: fe19d6e5b8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I301c82cf7e8ce1b067936fe90d6a301bda06856f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:36 +00:00
Arc Wang
af6c5ece00 [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: 4fcb75175f -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I2ba2dd701c0635469e337961c38e19238fffac9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:32 +00:00
Tsung-Mao Fang
5b897d1d2a [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: e07ccd7278 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I3e22abfccf57549ea7c1e19b69e2e03583a2757e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:30 +00:00
Arc Wang
b5bdaeeec0 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469 -s ours am: db800e96b9 -s ours am: 98cd637460 -s ours am: de0291af09 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: If7355342acdecb85ca85054c787023c2e2e685a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:28 +00:00
Tsung-Mao Fang
42fcccd769 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a4f -s ours am: 00cdaa2259 -s ours am: 3e42752f57 -s ours am: 65dd9235ef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I6fef15978e64b524428669467efb502c9b4302af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:26 +00:00
Arc Wang
cc278a4eba [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469 -s ours am: db800e96b9 -s ours am: 98cd637460 -s ours am: b7fc87093c -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I955a4aca19b7b679848d81eaa4215b5898dbdccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:26 +00:00
Tsung-Mao Fang
6b0a526193 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a4f -s ours am: 00cdaa2259 -s ours am: 3e42752f57 -s ours am: 24ca0a775c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I1ec763b7b3916bc15952ab0b50370eb9bd1000da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:25 +00:00
Arc Wang
a9cf6ae49a [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469 -s ours am: db800e96b9 -s ours am: 98cd637460 -s ours am: de0291af09 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: Id360282923f48a1878748aab05d8df3f71970202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:23 +00:00
Tsung-Mao Fang
6df34d0cf8 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a4f -s ours am: 00cdaa2259 -s ours am: 3e42752f57 -s ours am: 65dd9235ef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I82c96d4c5adbbb0925c9adf66333c4e9cd71b88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:22 +00:00
Arc Wang
34e9cfe937 [automerger skipped] Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev am: 27f9995beb -s ours am: b6ab2f9307 -s ours am: 374f91773b -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 40fbcf333f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: Id6e740f9276853b17bae161a78641ac3911a0a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:19 +00:00
Tsung-Mao Fang
d99d2d0b8d [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 90968c8437 -s ours am: d029dbf666 -s ours am: 79b30450be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: Id863b9998e90b5907bb5e329f149be7fb284d54e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:17 +00:00
Arc Wang
b5e38bcedb [automerger skipped] Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev am: 27f9995beb -s ours am: b6ab2f9307 -s ours am: 374f91773b -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 40fbcf333f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: I6fa40e0ed4550b641cec5d8d7a78cb0fa6324c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:15 +00:00
Tsung-Mao Fang
819635809c [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 90968c8437 -s ours am: d029dbf666 -s ours am: 79b30450be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: I62de545428d0172110b1db7c1c004ea0168f3ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:14 +00:00
Arc Wang
97830fc894 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469 -s ours am: db800e96b9 -s ours am: 98cd637460 -s ours am: 96034faa5b -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I12d5ad5db905b39bee2f53597fe2862038fbb2cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:10 +00:00
Tsung-Mao Fang
f201f8061d [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a4f -s ours am: 00cdaa2259 -s ours am: 3e42752f57 -s ours am: 8fbaf4af02 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I13e22a8a8be2000bd74617c542ed6ce716cf3f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:09 +00:00
Automerger Merge Worker
4d20ef334a Merge changes from topic "am-ec3a0df1a3ad4988a88c684ab54bac09" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev am: 27f9995beb -s ours am: b6ab2f9307 -s ours am: b50c098417 -s ours
  [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 90968c8437 -s ours am: d029dbf666 -s ours am: baab71a6c1 -s ours
2022-06-04 01:12:57 +00:00
Arc Wang
90168c06dd [automerger skipped] Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev am: 27f9995beb -s ours am: b6ab2f9307 -s ours am: b50c098417 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 40fbcf333f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: I75a430a240cb6ef10ba16d6fd5f3ff47950bb96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:12:53 +00:00
Tsung-Mao Fang
ac77ccb69e [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 90968c8437 -s ours am: d029dbf666 -s ours am: baab71a6c1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: Iec8031bb92ca6a0ff379ce1a9b0e6770f13db8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:12:52 +00:00