Commit Graph

110156 Commits

Author SHA1 Message Date
Lin Yuan
c7b6aa8cdd Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: 2a017ad0b6 am: 5f8e0a2887 am: d4f3d1fc07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I9b8234c9ddfd227c7ca26a6328c837f6212038f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:34:59 +00:00
Presubmit Automerger Backend
c5952edb4b [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: 5c94d6a6f3 -s ours am: 24e76bd184 -s ours am: 328cc73ecf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3957aa80b553a04df54291324c3a88d8201b7195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:34:57 +00:00
Lin Yuan
09250e5fe6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 8cbda65d7c -s ours am: bd58e26c2f -s ours am: 513e47879a -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: If627d602e475e5a5ec80951c9a35dcf9ae908a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:34:43 +00:00
Lin Yuan
ace0b6b829 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -s ours am: 660132025e -s ours am: 5ad09828dd -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: I113c154694f2eda64d676d7a8c89f8149f4f3c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:34:42 +00:00
Lin Yuan
103461fd9c Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27 am: d207ad5b48 am: 1577081f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I468ced9bb82320f17be4c7e2cdb96c0bb936e984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:33:42 +00:00
Lin Yuan
d4f3d1fc07 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: 2a017ad0b6 am: 5f8e0a2887
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ib2e447209e124bafec30ff384f1eadd1c3f3028c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:15 +00:00
Presubmit Automerger Backend
328cc73ecf [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: 5c94d6a6f3 -s ours am: 24e76bd184 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c2237e859cb813e7044995346b6eb96bb3a2cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:14 +00:00
Lin Yuan
513e47879a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 8cbda65d7c -s ours am: bd58e26c2f -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: I55eae2416c716410e55b74b2b191466f47baa61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:02 +00:00
Lin Yuan
5ad09828dd [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -s ours am: 660132025e -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: I000afc774854cdbdb892fa6ea600d632fd2c1c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:01 +00:00
Lin Yuan
1577081f44 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27 am: d207ad5b48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I416b58f263fbef13f71cf26905d4fdd27d1b5f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:14:53 +00:00
Lin Yuan
e1dd670d88 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours am: 2711034807 -s ours am: 6a8c2e4aa5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8a848665f57fe9b060c7f7949791daf0bafbdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:55:57 +00:00
Lin Yuan
39b4f6eadd Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: e1571f5bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ic04f451f566deabfe32e2f8946cece433304a573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:55:49 +00:00
Presubmit Automerger Backend
3ffb0faac0 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: 4698b47869 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01ebe137a5eeb8ef62d0dce5f5d8b6b6d362b030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:55:47 +00:00
Lin Yuan
f565fb18f7 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 4a645f0ee2 -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: I8109c61c621ac6b6b7a03b909441b4c7241e6e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:58 +00:00
Lin Yuan
e5526ded01 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: b9bf6300c4 -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: I5646ed16be776de8aa3c91fc0711e9ceb119b4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:57 +00:00
Lin Yuan
5f8e0a2887 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: 2a017ad0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I949bf3f5ff0ed34e9d26768b7198d3fd02dbcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:13 +00:00
Presubmit Automerger Backend
24e76bd184 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: 5c94d6a6f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ac53f7b3c2c818e7e546c1d0c6011d25c9b53bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:12 +00:00
Lin Yuan
2a017ad0b6 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I5b9a01ba9fd0fcabfb9e64e555b49861312b67f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:57 +00:00
Presubmit Automerger Backend
5c94d6a6f3 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80bebaf1553833c11d2daa03bb168dcf2bcfc5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:56 +00:00
Lin Yuan
9e412924da Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 33c3ae7a6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I28aca3666d3c936f3d0f141c88498a1b87f98d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:54 +00:00
Lin Yuan
bd58e26c2f [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 8cbda65d7c -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: Ic1b46ae9ad9db4e88c85a52d6b1d8f9f9b929090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:50 +00:00
Lin Yuan
660132025e [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -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: I3b8757623664ae94b11a856bcf8afc1de80ca9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:48 +00:00
Lin Yuan
d207ad5b48 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I8f27d54b9b621968ad7e09916a42d028473cb68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:24 +00:00
Lin Yuan
6a8c2e4aa5 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours am: 2711034807 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52bb66de257821a6dc073450737b3efd5ebf0a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:08 +00:00
Lin Yuan
e1571f5bad Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ib73bee64218be3289042c7e5a98e3995268e633f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:52:25 +00:00
Presubmit Automerger Backend
4698b47869 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79cef5ac33450f287d78028f06957f0ac39f923c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:52:23 +00:00
Lin Yuan
2711034807 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1511a2756ab39662081a8bf3386b591c07296cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:41:14 +00:00
Lin Yuan
6ff218c0d9 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Iffa9b63e7676c4d2539c2cda1beb130b27091b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:41:05 +00:00
Presubmit Automerger Backend
92e30fd1aa [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b3a99a0e8a50c5bb1032c8240bf936281e240ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:41:01 +00:00
Lin Yuan
8cbda65d7c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -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: I2eeaf1d6dace35bed73932d26a4c8c71d9db3392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:35:39 +00:00
Lin Yuan
62d47086be [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -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: Ief7035d92055b44a01b8954153a9939de32d5290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:35:38 +00:00
Lin Yuan
86c609fc27 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: Id0b3a441f5b7cad917f73076a57c15d775496862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:35:01 +00:00
Lin Yuan
9270941726 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd2a8bbd74365df0998917bfa360b3148157dcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:55 +00:00
Lin Yuan
e8887ee639 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ib1e30972098ad4a5ba86c1c02092a7d0fc57ac00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:47 +00:00
Presubmit Automerger Backend
128d5ad006 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fbb2409a9dd9ef9ad9eef90b135d4ac50636c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:45 +00:00
Lin Yuan
4a645f0ee2 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -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: I7962c164c6eeb218337f38f1deb2af48453b3510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:35 +00:00
Lin Yuan
b9bf6300c4 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -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: I13156739d8298de9caa6cccf23b79099ffce9b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:34 +00:00
Lin Yuan
33c3ae7a6c Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I1576571af1d404f0bffd2e9f64787d6b24d1b87d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:03 +00:00
Lin Yuan
381d6120b7 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: I043e7119d2fe281f085ba99ff12759dc588be57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:33:16 +00:00
Lin Yuan
cf07afd1a6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -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: I5faca0f1d45b2fbc962c507d397a78fb98079f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:33:01 +00:00
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
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
97c15312fa Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev 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
Muralidhar Reddy Mule
a534440e80 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 am: 095babe570 am: 74c30fff1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: Ia2594a29e9189fe53715ea872134c1f2a7706249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:42:34 +00:00
Muralidhar Reddy Mule
9d83f8d8cf Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 am: 8d9c7445a8 am: 5e1da1db62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: I78d9154908e24f1c15c8bb9a15989dab0abea4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:41:09 +00:00
Muralidhar Reddy Mule
74c30fff1b Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 am: 095babe570
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: Ia61be54cba497230a11efc5c3d53de4cb65620eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:16:07 +00:00
Muralidhar Reddy Mule
5e1da1db62 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 am: 8d9c7445a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: I7e045c9ad7d98430397a7db09ae8439e3e24f016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:15:50 +00:00
Muralidhar Reddy Mule
8d9c7445a8 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: Ie6673d39e96342de744f7ffad2bf3f49b8ff1805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:19 +00:00