Commit Graph

106597 Commits

Author SHA1 Message Date
t
8f55d65e04 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -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: I66d758bc3dc8bc00a2b6b916c0ebfcd8166f2f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 17:31:18 +00:00
Treehugger Robot
3e0290986f [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: cf2d79ba25 -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: I1d85938295d44fcb07e9c33f68ff6a04701e61ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 17:31:06 +00:00
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
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
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
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
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
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
702da9e7ab Merge "Disable factory reset in DSU mode" into tm-qpr-dev 2024-10-24 07:08:03 +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
692f794e6f Merge "Disable factory reset in DSU mode" into tm-dev 2024-10-24 02:51:24 +00:00
Guojing Yuan
8d5e11d9d8 [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 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: I7fa4e6833e674e1fdc6d000cddd5a3235837271c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:50:11 +00:00
Guojing Yuan
9d5bbc8e9b [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 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: Iae70fb15fcd0613f74d0b23f351d9f5eba8a76fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:30:28 +00:00
Guojing Yuan
d4a01ee0db [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -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: I355a696d03b58ea53a4a4a0485878d14eee2314c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:00:44 +00:00
Guojing Yuan
c45030ba4b [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247

Change-Id: Id7576ad8435bf12972833f0ed056a6edf991b77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 18:45:15 +00:00
Guojing Yuan
268575fb3a [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247

Change-Id: I26b92140443f28084cb514da60e1febcf599dfc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 18:25:14 +00:00
Guojing Yuan
59cdc3e20c [CDM][NLS] Check if the NLS service has an intent-filter
Bug: 363248394
Test: CTS
Flag: EXEMPT bugfix
Change-Id: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
Merged-In: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
(cherry picked from commit 7ae59a42eb)
2024-10-15 17:14:05 +00:00
Guojing Yuan
54142da21f [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: I83d612fbcc6ff78dd455ecf30d17d16f99900426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:19:28 +00:00
Guojing Yuan
120f2345b8 [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: I42468b1d2bfb94f7f5645a8e710ed67818a38317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:01:25 +00:00
Guojing Yuan
d440f2ef05 [CDM][NLS] Check if the NLS service has an intent-filter
Bug: 363248394
Test: CTS
Flag: EXEMPT bugfix
Change-Id: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
Merged-In: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
(cherry picked from commit 7ae59a42eb)
2024-10-04 22:51:57 +00:00
t
d45a07894b Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-09-05 05:34:25 +00:00
t
0764d71e82 Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-09-05 05:34:10 +00:00
Chris Antol
643de3a734 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: e87c0617b7 -s ours
am skip reason: contains skip directive

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

Change-Id: I9b9ccce41947dadb48683e841ed71a13e9fecbc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:59:54 +00:00
Fan Wu
bb2a315a2e [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours am: c62678a33c -s ours
am skip reason: contains skip directive

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

Change-Id: Iecbab3ec36a71769f57a5463230ab70725c6de30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:59:49 +00:00
Chris Antol
e87c0617b7 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours
am skip reason: contains skip directive

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

Change-Id: Idc01023c10d19f55f321a75a0bef5462eafd171e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:49:01 +00:00
Fan Wu
c62678a33c [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours
am skip reason: contains skip directive

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

Change-Id: Iba0a3daf3db2cafab7004aa96f3d232a73012684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:48:58 +00:00
Chris Antol
439a39b81f [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours
am skip reason: contains skip directive

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

Change-Id: I43a83d18af7402320cd4ba897cada8c36e21c7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:39:26 +00:00
Fan Wu
1a7d021bc7 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours
am skip reason: contains skip directive

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

Change-Id: I7068c891b7b16d1f5a31b6d58eabf82a3f722710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:39:21 +00:00
Chris Antol
644abd841c [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-qpr1-dev am: ac3b33c26d -s ours am: b611ef7be9 -s ours am: 0523542d74 -s ours am: bbbaaab07c -s ours
am skip reason: contains skip directive

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

Change-Id: I85e129ce7190811bd6ce99f56456943c7e51b434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:29:30 +00:00
Fan Wu
f7e504d0d4 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 0c72cfad1e -s ours am: de85b9a13c -s ours am: 514ec40384 -s ours am: 953b16ed3c -s ours
am skip reason: contains skip directive

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

Change-Id: I7a74e3d15e37c9c4f9c6b87e067744a14cb0e753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:29:27 +00:00
Chris Antol
97e33fc9a9 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours
am skip reason: contains skip directive

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

Change-Id: I43d7093fa9512fbf38e972dffa17d233a45154bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:29:18 +00:00
Chris Antol
e8d53c5925 [automerger skipped] Merge "Checks cross user permission before handling intent" into sc-v2-dev am: d6ee2d0a98 -s ours am: b4e56ee1ce -s ours am: 57c3c02f26 -s ours
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 c24808f9b6 is already in history

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

Change-Id: Ib5249b5ce226bda72b430b8ae631a54b08411c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:29:15 +00:00
Fan Wu
7eb7f4d12b [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours
am skip reason: contains skip directive

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

Change-Id: If1d39346ff8361175b9f2f91bd7d882061bfb8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:29:14 +00:00
Fan Wu
56279712e0 [automerger skipped] Checks cross user permission before handling intent am: ff4daf4bf4 -s ours am: be5426cc0b -s ours am: 6b58ce5ed2 -s ours
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 c24808f9b6 is already in history

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

Change-Id: I6e26e2803f04efabbdcf9e475cb7a9fb847cccbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:29:12 +00:00
Chris Antol
d922d40aa5 [automerger skipped] Merge "Checks cross user permission before handling intent" into tm-dev am: 876787b619 am: 738d310091 -s ours
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 964908bc14 is already in history

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

Change-Id: If8c0c4f11432ed1dd4b13f12f19ae38080ae5154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:29:02 +00:00
Chris Antol
bbbaaab07c [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-qpr1-dev am: ac3b33c26d -s ours am: b611ef7be9 -s ours am: 0523542d74 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie78f479f26cd5ca0566d61c56667e19d43a1d03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:28:31 +00:00
Fan Wu
953b16ed3c [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 0c72cfad1e -s ours am: de85b9a13c -s ours am: 514ec40384 -s ours
am skip reason: contains skip directive

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

Change-Id: Ib35017e45d2b0892ee6e6c5cec3422e6a98f5d8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:28:28 +00:00