Haijie Hong
|
21b075770e
|
Improve Bluetooth pairing dialog & contact sharing toggle
Before change: https://screenshot.googleplex.com/Agr29KTvgptbsag
After change: https://screenshot.googleplex.com/ArjiavkFAFiuCTR
Bug: 274521434
Test: RunSettingsRoboTests
Change-Id: Ib896b70bc219de128b733b75249bf80e3389f221
|
2023-08-08 13:15:38 +08:00 |
|
Eric Biggers
|
e7170062ac
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 86ae3f9f7a -s ours am: d0a6da4f8a -s ours am: 791a64a380 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Ibcce202513dd2f43c80207fcb8f944200165dd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:15:13 +00:00 |
|
Automerger Merge Worker
|
3cb6ef1a6a
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: 654b36564f -s ours" into udc-qpr-dev-plus-aosp am: d83aa5d781 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I489f0e00c2d99ae6eeb26f12d28e5cd6c524243e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:11:52 +00:00 |
|
Eric Biggers
|
71ae367906
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: 654b36564f -s ours am: 5011c1a64c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: Ia53f46184659a6fbf3682ce971c845c8385bfffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:11:46 +00:00 |
|
Automerger Merge Worker
|
ef0812efe1
|
Merge changes from topic "am-7fd9b2ff33084bf2a8b3220c94124f2f" into udc-qpr-dev-plus-aosp am: 680254fe79 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: Id1b7a1ce3320215fb43b59067f21186a29b703b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:07:11 +00:00 |
|
Automerger Merge Worker
|
974d042a77
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: 3a7a9be734 -s ours" into udc-d1-dev-plus-aosp am: 2d4ca1db18 -s ours am: 80daabd077 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I2a91f2d7e8ea70d82b18a744dfc12ece42eb0525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:07:06 +00:00 |
|
Chaohui Wang
|
e9cf4bf65c
|
Merge "Convert DataUsageLib to Kotlin" into main
|
2023-08-08 05:05:01 +00:00 |
|
Eric Biggers
|
b22fadff5c
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 8e234af041 -s ours am: 7989bc077b -s ours am: 10592e4261 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Idc2a8f0070d384ca5b95061e222886219c9c3f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:02:40 +00:00 |
|
Eric Biggers
|
d01ae4c976
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I5403f06aa7d1d66b6950c72582dc3197102574d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:00:08 +00:00 |
|
Eric Biggers
|
c748718a68
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I5871794bf6b1523258eb2e873c1be1cde4fd798a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:59:45 +00:00 |
|
Eric Biggers
|
2b385e7da2
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I022ecb77d56f7a460d8a16887e2e406748951ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:59:20 +00:00 |
|
Eric Biggers
|
2f1ea667fa
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: a273ae9983 -s ours am: 6485d347ff -s ours am: 78829676e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I00fe5ac58026e5e50e61178e7ee00712239165f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:59:05 +00:00 |
|
Eric Biggers
|
ea0207c908
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I2a3b27cf188c25acaf0f66ebcb8066d07bb3f6a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:58:51 +00:00 |
|
Eric Biggers
|
7ae93284fc
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Iec14dce103483456d7701233f493374b407eafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:58:19 +00:00 |
|
Eric Biggers
|
32ba927770
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Iae1282ad8ab0f04f3b10f378067bc8fa3237f86a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:58:04 +00:00 |
|
Eric Biggers
|
4241da06f6
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Icf950b0ec4b92690df5c93e6cef95aeb54827122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:55:36 +00:00 |
|
Eric Biggers
|
d60572e3ed
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Ia76c21ecb40e78b8ca7d02d569a08b2b119d09f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:54:40 +00:00 |
|
Kohsuke Yatoh
|
5e3cbc3fa6
|
Merge "Add @SearchIndexable to OneHandedSettings fragment" into main
|
2023-08-08 04:53:45 +00:00 |
|
Eric Biggers
|
57e52a7da8
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Ibd1c3d6db0c9353747acd4b9d0172668767009fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:53:44 +00:00 |
|
Automerger Merge Worker
|
5956c7a7aa
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours am: c7b0174776 -s ours am: 30d0159217 -s ours" into udc-qpr-dev-plus-aosp am: 73c7b0db75 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: If3052beffdb3d5a913fdda0bb5a20c3fdd6bb03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:49:50 +00:00 |
|
Eric Biggers
|
5c2efb2203
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours am: c7b0174776 -s ours am: 30d0159217 -s ours am: 6dd2a01bee -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: Idb29913023835f6466a0db93c47e2c7d3a27c243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:49:44 +00:00 |
|
Automerger Merge Worker
|
3a1c4f2275
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours" into udc-d1-dev-plus-aosp am: 93a87de2e2 -s ours am: 4d45520bc1 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I463d76595c729e8321de9572521dd1e38a6108bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:47:36 +00:00 |
|
Eric Biggers
|
81e8ce7777
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: e58383243e -s ours am: 45f6bac6ec -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I7417043e746c768470565d9d82dea05df9aeacd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:47:33 +00:00 |
|
Eric Biggers
|
fa4d7cc866
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours am: 92470de980 -s ours am: 27d521036b -s ours am: 39f4e9b1f6 -s ours am: 360f3200ac -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I4eaf470de8e8f5d2edf03ecb235c2b23027fbc4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:45:45 +00:00 |
|
Eric Biggers
|
ea6a8f1caa
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours am: 4e139e4ed1 -s ours am: d3a84d32e7 -s ours am: 62644922e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I2928e4deb2c4d7b1d0939ec587992d603c3d0c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:44:20 +00:00 |
|
Automerger Merge Worker
|
0c7d8e628b
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 8e234af041 -s ours" into udc-d1-dev-plus-aosp am: e53cd73324 -s ours am: 0a701b78ed -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I49b20718ebea622cabcb8b51d3e8258a49d15c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:43:11 +00:00 |
|
Eric Biggers
|
7afa69b018
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 8e234af041 -s ours am: 8c540d4317 -s ours am: 70221829bb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I15868448c537b162d28cf34a9fea5f64281524ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:43:06 +00:00 |
|
Eric Biggers
|
ce4c24b1ef
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours am: f509f69b79 -s ours am: 7946f730fd -s ours am: 37850ca15b -s ours am: d187078cdb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I57e7385ea9854b94985d7ee351b7a6c66ed2d8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:40:25 +00:00 |
|
Eric Biggers
|
9a81f424ae
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 03fce45518 -s ours am: e0bb7a6d16 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I7ceca59d404065d1aff4c8760c5b9aafe4664536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:39:27 +00:00 |
|
Eric Biggers
|
73e60b2c1f
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours am: 92470de980 -s ours am: 15dd19b9c0 -s ours am: b39bb1cacf -s ours am: 720ba62553 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I4432c4aa1e02f626462e6cbcf622c0be81ab2da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:39:22 +00:00 |
|
Eric Biggers
|
d220b79a3f
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Ifec3990978057829e349649f96e93d044183ea93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:39:08 +00:00 |
|
Eric Biggers
|
791a64a380
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 86ae3f9f7a -s ours am: d0a6da4f8a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I438211982be0c355fa1da105434e491b2e1c0c2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:38:59 +00:00 |
|
Automerger Merge Worker
|
d83aa5d781
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: 654b36564f -s ours" into udc-qpr-dev-plus-aosp
|
2023-08-08 04:38:48 +00:00 |
|
Automerger Merge Worker
|
680254fe79
|
Merge changes from topic "am-7fd9b2ff33084bf2a8b3220c94124f2f" into udc-qpr-dev-plus-aosp
* changes:
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: 3a7a9be734 -s ours" into udc-d1-dev-plus-aosp am: 2d4ca1db18 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: 3a7a9be734 -s ours am: b1ea26ca9a -s ours
|
2023-08-08 04:38:16 +00:00 |
|
Eric Biggers
|
965d046088
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Ie551a7a2186c17a12680a90eba3bd5b47fb743c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:38:06 +00:00 |
|
Eric Biggers
|
5011c1a64c
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: 654b36564f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I532e13919ab5863bc8ab4ce171a536018ebf2047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:38:03 +00:00 |
|
Automerger Merge Worker
|
80daabd077
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: 3a7a9be734 -s ours" into udc-d1-dev-plus-aosp am: 2d4ca1db18 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I645f155d6c0e411cbb08fa77bfe6237c2a2a9730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:54 +00:00 |
|
Eric Biggers
|
2ebebf4f9e
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: 3a7a9be734 -s ours am: b1ea26ca9a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I8f89eb907bdfa947725ee34748add782d94c2c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:52 +00:00 |
|
Eric Biggers
|
10592e4261
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 8e234af041 -s ours am: 7989bc077b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I726a09e0fb90fb24773556840d266e5718eab382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:20 +00:00 |
|
Eric Biggers
|
45e6fbbb81
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Ifed87fa6fe5e873ced826ac403159cd2f83b429a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:06 +00:00 |
|
Eric Biggers
|
d8fb55ae4d
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I5d797ffc9caba9ac5555411ba161c2981553b487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:36:20 +00:00 |
|
Eric Biggers
|
35a71fed88
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: Ica92dfc4d8dc2d1405d8853610fe6b10c2f4adb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:36:18 +00:00 |
|
Eric Biggers
|
2e92835b46
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I073072f7456fbbc1b53bde1327e4e8414f7b1ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:36:06 +00:00 |
|
Eric Biggers
|
50261c4b0a
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I019893d6ed0b2acc84f33282c969484d51d57bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:36:03 +00:00 |
|
Eric Biggers
|
78829676e9
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: a273ae9983 -s ours am: 6485d347ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I9b0e8528e0e743b040e554c4c41f8fa005c0fdf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:35:49 +00:00 |
|
Eric Biggers
|
e6f327e981
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: a273ae9983 -s ours am: 99668c5055 -s ours am: cef3f95af0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I633df6ef0322a7571054bee08fad4357eb6f7fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:35:42 +00:00 |
|
Automerger Merge Worker
|
73c7b0db75
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours am: c7b0174776 -s ours am: 30d0159217 -s ours" into udc-qpr-dev-plus-aosp
|
2023-08-08 04:35:31 +00:00 |
|
Automerger Merge Worker
|
4d45520bc1
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours" into udc-d1-dev-plus-aosp am: 93a87de2e2 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I28891ecd13e327e8d073c6056a97d0cc95de1eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:35:11 +00:00 |
|
Eric Biggers
|
45f6bac6ec
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: e58383243e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I5e912d366f784b98ff73ac5cb8ccdab07381cd89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:35:07 +00:00 |
|
Eric Biggers
|
6dd2a01bee
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours am: c7b0174776 -s ours am: 30d0159217 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I7615c1c2ba5edffd6bd35db2410ef50d7e21e0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:34:54 +00:00 |
|