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 |
|
Hao Dong
|
e3e5aee5e9
|
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:28:22 +00:00 |
|
Guojing Yuan
|
bd461d807e
|
[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: 613f019fb2 -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: I752668ef93c9b70cf0c103f88429b10a0edbfabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-15 20:22:05 +00:00 |
|
Guojing Yuan
|
39d6677be3
|
[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: aa43306ed8 -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: Ic97e5660be665dbac4253ff4c2f6d41fd2764c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-15 20:21:53 +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 |
|
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
|
ab697f3776
|
[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: I5cd6560809682c31f1255d4d852c01ac650f45f1
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
|
65885fd60d
|
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: 0d8ed82e9c -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/+/29710883
Change-Id: Ibe59854146bd50d0e87ddc5f53155d494c079537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 23:54:34 +00:00 |
|
Guojing Yuan
|
99e4b9de4b
|
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours am: c048539b4f -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883
Change-Id: I7b70769070b3eed4ce29664bd7aa42c5f9678011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 23:54:24 +00:00 |
|
Guojing Yuan
|
0d8ed82e9c
|
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -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/+/29710883
Change-Id: Ieb97938c211a577d538dc87cc414c39123186ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 23:46:21 +00:00 |
|
Guojing Yuan
|
ea96b4ab21
|
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -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/+/29710883
Change-Id: I6611ffb97886d6bf5efb3c198370a2951c77eb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 23:38:51 +00:00 |
|
Guojing Yuan
|
c048539b4f
|
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883
Change-Id: I73162c7a274b7042632ae4c917ec489b407bde19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 23:38:35 +00:00 |
|
Guojing Yuan
|
d8dcbcd076
|
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883
Change-Id: Id18c4027da722d4874b91aae22d19073f921f416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 23:19:57 +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
|
760d594cff
|
[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: Iab4e925157e013de4d2a34864856bff0b10ae065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 23:01:23 +00:00 |
|
Guojing Yuan
|
8439a2542d
|
[CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: edf497802d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711106
Change-Id: I3270fd29d05b97b043ed2d46516f35ef0e9ef793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 22:25:04 +00:00 |
|
Guojing Yuan
|
edf497802d
|
[CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711106
Change-Id: Ic894c297273b36c0df8c9a9055cdd24e40306f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-10-14 21:59:55 +00:00 |
|
Hao Dong
|
2b7c1f1105
|
Set class name when createConfirmDeviceCredentialIntent() API is used.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
|
2024-10-11 03:57:00 +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 |
|
Guojing Yuan
|
e4fe2f5b81
|
[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:50:07 +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
|
76260a7884
|
Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
|
2024-09-05 05:34:20 +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 |
|
t
|
15af7d7d55
|
Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
|
2024-09-05 05:33:50 +00:00 |
|
Chris Antol
|
12f8d7bf61
|
[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: 643de3a734 -s ours am: e910f78da0 -s ours am: 131b40d319 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: I324aa7755778ab3cc9db44aab1c5672e9ad892ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-09-05 04:20:00 +00:00 |
|
Fan Wu
|
47ca313370
|
[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: bb2a315a2e -s ours am: 3dccfc4c7c -s ours am: 455106410b -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: Iae796aa8a524b8d9f65275f1276b4680b67d1f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-09-05 04:19:55 +00:00 |
|
Chris Antol
|
f7f1b35f55
|
[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: 56855ee5ce -s ours am: 0c49b61d4d -s ours am: 53c4f14dc2 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: Iec5c9fcbe2ba57e0b92112043cb8d9b36c3d430e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-09-05 04:19:43 +00:00 |
|
Fan Wu
|
40824d2397
|
[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: 6cbd31acf2 -s ours am: 8445123224 -s ours am: 1d2f120c60 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: I4de86a3baf4a114e8a7d29b1bf4e0abc534f62d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-09-05 04:19:38 +00:00 |
|
Chris Antol
|
131b40d319
|
[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: 643de3a734 -s ours am: e910f78da0 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: I26b6ef6f14743c421be9c009eff106caaf0a2673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-09-05 04:10:13 +00:00 |
|
Fan Wu
|
455106410b
|
[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: bb2a315a2e -s ours am: 3dccfc4c7c -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: Ic13306b109176e0c5b9e46005f500168eadb2e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2024-09-05 04:10:10 +00:00 |
|