Commit Graph

106356 Commits

Author SHA1 Message Date
Tsung-Mao Fang
be43e244e4 [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: 8b0f218a41 -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: I9ece7cdeebbfeb4dc0f2b3e249debb489a43ae15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:45:10 +00:00
Arc Wang
1aab00ef9c [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: 649676228a -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: I832cf73d11824fa7debd18307f73f98e45353185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:44:29 +00:00
Tsung-Mao Fang
ddb5ab1885 [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: fe69402b1a -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: I70479f0751485909a226ebcb7b5bdb56d65ee304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:44:28 +00:00
Arc Wang
489a39d108 [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: b5bdaeeec0 -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: I3f0cb5e4c8013ecbefdbe6c63a0337f203aa88a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:43:45 +00:00
Tsung-Mao Fang
f5ee1558fa [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: 42fcccd769 -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: Id0337918f4a26cbcf77a8d4954875f74ceaaf3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:43:44 +00:00
Arc Wang
ab871b542b [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: 34e9cfe937 -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: I10d5296281957785bc45ea8ea73d0189fe58e8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:41:48 +00:00
Tsung-Mao Fang
3f0689ec22 [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: d99d2d0b8d -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: If9786b10a29efbd1f30dc28950aaf1fd9de59a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:41:47 +00:00
Arc Wang
7ac2e3465c [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: 97830fc894 -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: If0b92af5a71a768fcee5d83eed55d2e82cd63a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:39:13 +00:00
Tsung-Mao Fang
5a4555d818 [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: f201f8061d -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: I7150bf34ad4df1325215f2cfcf1828f26ab6a67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:39:12 +00:00
Automerger Merge Worker
5198582cf1 Merge changes from topic "am-ec3a0df1a3ad4988a88c684ab54bac09" into tm-d1-dev-plus-aosp am: 4d20ef334a -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/+/18704656

Change-Id: I9764872425340e59dc3c212bdb892df2963660c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:32 +00:00
Arc Wang
720c7ca013 [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: 90168c06dd -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: I77d3e4494d19657a5ec837320ea63f717b5907df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:30 +00:00
Arc Wang
6fbd4bc18a [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: 85122bffda -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: Ic6426d4ad1d5b7cacb61470a2b0b1f71412654e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:25 +00:00
Tsung-Mao Fang
6eea577c85 [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: 5dcde87d87 -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: I591122b66c2e9a9c8abc7ca334e3c1c3ad5942fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:24 +00:00
Arc Wang
4d44f7c125 [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: 96491e4b52 -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: Iaed8fb7da4179c95294869ef196d9d5d3e9f2e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:13 +00:00
Tsung-Mao Fang
165ae8d29b [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: 6542e2c009 -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: I7005a246efaa275f8e0137be7c697e12755a8ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:12 +00:00
Arc Wang
65e4afff91 [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: af6c5ece00 -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: Ifbcc7626941e57f9afa5dc68b76aa2f88543f3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:02 +00:00
Tsung-Mao Fang
d05b3a539b [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: 5b897d1d2a -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: I49605fda61a1b9b0fcd676570f515f9dc2ae870b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:38:01 +00:00
Arc Wang
cc822330ef [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: a9cf6ae49a -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: Iaf5bde2c4ae807756ffa7f1ffab1f02776679372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:37:51 +00:00
Tsung-Mao Fang
680f193fc5 [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: 6df34d0cf8 -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: I8ef968bd43d987e8e5a0fa0cc5b67ad83e9d0d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:37:50 +00:00
Arc Wang
3e65574b77 [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: b5e38bcedb -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: I26f7cece4d8950d391e2425de42cf3438a9f3b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:37:31 +00:00
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
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
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
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
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
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
Raphael Kim
0dc51dd967 [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 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: I0480a54627197d611577e49af147162247c1d631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:12:39 +00:00
Raphael Kim
386af8fa0b [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 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: I17250fee26ce389f5bd8e03eaff10ac4b6f55440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:12:37 +00:00
Raphael Kim
afe35375f2 [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 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: I39b7fcecbaf533138f12e92ddac972b9a3d5f534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:12:19 +00:00