Commit Graph

124547 Commits

Author SHA1 Message Date
t
0d3a30ca1b [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours am: 0543ab7266 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: I8b35218fb12596c37993244a401be375899fce3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 17:31:02 +00:00
t
9c42b1876f [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: fbebc1cd0e -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Iac373a00d498c30cbfdc8a5d0636d2c1aeda39ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 17:30:48 +00:00
Treehugger Robot
941e1cadc4 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: I844612da77f618e4f89d5f1c46053717ec7d9440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:36 +00:00
Treehugger Robot
3ee1da0bb3 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: Ie80a76fd76c5663d7f5865c5b150d2a86e50ba16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:36 +00:00
t
98160a777b [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: I83245d18fdfe0307bd05baf260571f9a7cf77413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:33 +00:00
t
13412879cc [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: I267312e9990ec592035d1eaf8cec5170cb609390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:33 +00:00
Treehugger Robot
cf2d79ba25 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351 -s ours am: 8009906cb6 -s ours am: bd29320e54 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: Ic3ea9786a8e8f068ee19601e9074f8bfd0553d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:23 +00:00
Treehugger Robot
8b1a4a7284 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351 -s ours am: 8009906cb6 -s ours am: bd29320e54 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: I69da7ee3bcd804205cfce3c432bff6fb930ff647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:21 +00:00
t
0543ab7266 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: I53b0a3b2106e2a53156ee2bbf61a3f1f38ab0627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:19 +00:00
t
d84a064bae [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours am: c3ae6b4ede -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: Ib100d8c28c99b79e12404502a3299461c5e1391b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:18 +00:00
t
fbebc1cd0e [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Ia8b44715af2197303ac25966dd6a4283f6134b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:10 +00:00
t
24bed1e450 [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: If79e54816d2449ec36678c15fe1ed077e17df30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:42:07 +00:00
Treehugger Robot
772238abd6 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: I217c17af94f653ecc729fde5eb563fc027ebfc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:27:22 +00:00
t
d8cb5e9765 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

Change-Id: I3284530cc6adc3fc1d5efcf4590579715021b938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:27:16 +00:00
Treehugger Robot
bd29320e54 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351 -s ours am: 8009906cb6 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: I13e0585463f359d309e5b08791d84376c941fd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:26:44 +00:00
t
c3ae6b4ede [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: I421a4dd6ef11d39b8e8370e2f2a3cb982ae82477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:26:39 +00:00
t
7d3a9a197f [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Id6c20b26794b08de160a19f30c06b77987e7672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:26:25 +00:00
Treehugger Robot
87a47bad19 Merge "Disable factory reset in DSU mode" into sc-v2-dev 2024-10-31 16:08:11 +00:00
Treehugger Robot
8009906cb6 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: Idcc24125f545e6d99c7485371203fb8953db3566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:07:44 +00:00
t
c2513dc8d0 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

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

Change-Id: I6696719e4052fc9446ceb4648986038750483961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:07:38 +00:00
t
fc128d434f Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430

Change-Id: If07b596780bae7445dc86e32e94f8f0a65bd0e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:06:59 +00:00
Treehugger Robot
93b2db6351 Merge "Disable factory reset in DSU mode" into sc-qpr1-dev 2024-10-31 15:59:47 +00:00
t
d1f90f717a Disable factory reset in DSU mode am: 4296cc1977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430

Change-Id: I3030c76274a9a9f48b784d23a5af5fc73deef870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 15:46:28 +00:00
t
a2741a76cb Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build

Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-10-25 06:34:19 +00:00
t
27619dd45c Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build

Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-10-25 06:34:08 +00:00
t
4296cc1977 Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build

Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-10-25 06:33:59 +00:00
Howard Chen
615233b698 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab -s ours am: 04a6b4ebb3 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

Change-Id: I3f43414612ee1984ee29d69624e91275d07128c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 07:42:46 +00:00
t
6dac577285 [automerger skipped] Disable factory reset in DSU mode am: 0764d71e82 -s ours am: a9662d8983 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

Change-Id: I4d4158e7958cbbda454dd86afa053b723b496949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 07:42:43 +00:00
Howard Chen
04a6b4ebb3 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

Change-Id: I7049edee91325ac9eeacc6a435f5cc895737d2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 07:30:25 +00:00
t
a9662d8983 [automerger skipped] Disable factory reset in DSU mode am: 0764d71e82 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

Change-Id: I3250660e299902e6fef14d7933269797fe33366a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 07:30:18 +00:00
Howard Chen
702da9e7ab Merge "Disable factory reset in DSU mode" into tm-qpr-dev 2024-10-24 07:08:03 +00:00
Howard Chen
29c7e21bfe [automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Ie34b8bf22e63f9f8a8ab38e49612d6c3ac8cf314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 06:44:11 +00:00
t
7c1a58f697 [automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I8b8b21b6282ed4b08d892dea33fe2e6a181468c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 06:44:00 +00:00
Howard Chen
3f7f1a7c45 Merge "Disable factory reset in DSU mode" into udc-dev 2024-10-24 06:24:31 +00:00
Howard Chen
89ee71f997 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours am: f39aa3eae6 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I06ad32bd19235257e92f813740cba674df00d25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 03:56:22 +00:00
Howard Chen
f39aa3eae6 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9 am: db47f7bfe8 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: I9fc84657515c2929eb125470275147eb825c8902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 03:51:11 +00:00
Howard Chen
22d4e17415 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: Iac3a36596ad2bb82cc799153f5888de5c513f338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 03:50:56 +00:00
Howard Chen
00143bf156 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: I3a815a0a9f65ad1814741e58f781301f9b9f6fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 03:30:08 +00:00
Howard Chen
db47f7bfe8 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: I4543cb19cedf28eefdc5abebadc09c8ada257a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 03:29:36 +00:00
Howard Chen
75a0b01eb9 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: If2785ed3b6eb14fd67ee8d045c0d7c2463904ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 03:13:10 +00:00
Howard Chen
d498d8b580 Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306

Change-Id: Ic7af2a8f42525f1bca70b370f0c27a8175cb2a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-24 03:13:08 +00:00
Howard Chen
692f794e6f Merge "Disable factory reset in DSU mode" into tm-dev 2024-10-24 02:51:24 +00:00
Hao Dong
c70e6bf477 Set class name when createConfirmDeviceCredentialIntent() API is used.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
2024-10-16 23:01:40 +00:00
Hao Dong
d158b1675a Set class name when createConfirmDeviceCredentialIntent() API is used.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
2024-10-16 22:59:25 +00:00
Hao Dong
931b100159 Set class name when createConfirmDeviceCredentialIntent() API is used.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
2024-10-16 22:47:35 +00:00
Hao Dong
63eda7f3a9 Set class name when createConfirmDeviceCredentialIntent() API is used.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
2024-10-16 22:45:47 +00:00
Guojing Yuan
613f019fb2 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: 9d5bbc8e9b -s ours am: 8d5e11d9d8 -s ours am: 444c871412 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I210384ce88bc3586e0ef50e8c1d2f803c6ba4198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:15:10 +00:00
Guojing Yuan
444c871412 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: 9d5bbc8e9b -s ours am: 8d5e11d9d8 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I8c1abdad66ca8be3644ea67dde1cd77a87044a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:08:15 +00:00
Guojing Yuan
aa43306ed8 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: ab697f3776 -s ours am: 5c59d451ac -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I8c3d9d575f6d0caf9e3810cec5f1b9ef7965650e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:08:02 +00:00
Guojing Yuan
5c59d451ac [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: ab697f3776 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I8edbacc880f6e6a1c99c71d3394774175817a5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:50:39 +00:00