Commit Graph

133606 Commits

Author SHA1 Message Date
Eric Biggers
2b54c0c71d [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: 2b385e7da2 -s ours am: 8a0045b284 -s ours am: 259fdb74ad -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: I9debbb42f2164c023a5c0ecf5e332439dd8b2d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:15:53 +00:00
Eric Biggers
ed44c10835 [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: 4241da06f6 -s ours am: 61785ffddd -s ours am: 172991be6a -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: I3702fc9492ad01f4570e3f14c9565ed413482a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:13:59 +00:00
Automerger Merge Worker
48496ca00c Merge "[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: d60572e3ed -s ours" into udc-d1-dev-plus-aosp am: 1eb56a1e47 -s ours am: 5a94df0299 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I2dd8eb4c8fa418bc1520b127715fc04a4db1fc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:12:59 +00:00
Eric Biggers
dbce69ee3c [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: d60572e3ed -s ours am: 5621f2a1fd -s ours am: 37816dee32 -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: Ic5512a7664c808d8c4b3c5dc512dcad3c58efddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:12:54 +00:00
Eric Biggers
a8f2733a2d [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: 32ba927770 -s ours am: a837b676c9 -s ours am: f351d2f2d1 -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: I04322890cce9b7dca66ec87832b26a708cb58192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:10:31 +00:00
Automerger Merge Worker
9722cc089d Merge changes from topic "am-26c28ebb54a241eea293a13ad6ca0543" into udc-qpr-dev-plus-aosp am: 8bc7f7ea86 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I8c3b1bd9144883b68af9c37c322f0d84eb7507bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:07:35 +00:00
Automerger Merge Worker
fcacec2eb6 Merge "[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: 57e52a7da8 -s ours" into udc-d1-dev-plus-aosp am: 2df94229d9 -s ours am: 8b90c3dcd2 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I53ffbb39496b71d913a16e7e9efee050ed7c5882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:07:29 +00:00
Eric Biggers
395583293d [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: 4241da06f6 -s ours am: 9c22ad2b3c -s ours am: 2c8967d76c -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: I737f03a7166384d4e557b23037b18a73acadc5a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 07:01:18 +00:00
Automerger Merge Worker
9ded4c9e7c Merge "[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: d60572e3ed -s ours am: cdf5989035 -s ours" into udc-qpr-dev-plus-aosp am: 384191b983 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I96a11e3af6b223faa79f0fd3be9ae6ae485f00be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:59:21 +00:00
Eric Biggers
ab694439df [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: d60572e3ed -s ours am: cdf5989035 -s ours am: 36ea4a7580 -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: Ic844ed1a41a297f04dc172fa7bf64950db92866e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:59:17 +00:00
Automerger Merge Worker
9cbaecf1ff Merge changes from topic "am-d3c7160b969d4753a0d372fc1ebd01d5" into udc-qpr-dev-plus-aosp am: 17e17a55c5 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: Ifea8e82fc5611a931069c7827fd8547905af1802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:55:34 +00:00
Eric Biggers
2038373c06 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 2e92835b46 -s ours am: a2712b2b5e -s ours am: 32991b881f -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: I3d3818b8637dd3d11ab069b1ff133c6c1c59c624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:55:29 +00:00
Eric Biggers
b71d102176 [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: 57e52a7da8 -s ours am: ae39fa7e2a -s ours am: d20b6385f0 -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: I07e159d033956240f59e23948d866bc464b6b75a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:53:04 +00:00
Automerger Merge Worker
0fc78b0ffa Merge "[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: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours am: 090679fdc8 -s ours" into main 2023-08-08 06:51:09 +00:00
Eric Biggers
3c01e84096 [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: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours am: 090679fdc8 -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: I4df5192ebbda031a185248a9f7ee5d941172696a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:49:58 +00:00
Automerger Merge Worker
da096cf99d Merge changes from topic "am-cd5a3cea6b294c4983a26f694f5a5c34" into udc-qpr-dev-plus-aosp am: 93e778592b -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I98207b8ae6df0aa7b8a76d2ae90303737ed5b315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:49:43 +00:00
Eric Biggers
5144ea53c1 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: b87c5aa1a9 -s ours am: 5892ffe6c5 -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: Ic5d2922633c04dd77535052103d1fcba05fad5e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:49:38 +00:00
Eric Biggers
53e4549bea [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: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -s ours am: cb6b7e05ec -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: I2270d48bf4555f988185db467c0d1e3fd741ea6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:48:27 +00:00
Automerger Merge Worker
de91c824d1 Merge "[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: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours am: b6bfcdcabd -s ours" into main 2023-08-08 06:48:08 +00:00
Eric Biggers
93eaa6f27a [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: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours am: b6bfcdcabd -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: I731c9816623582b29d5d84136e9418bbe94863d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:46:58 +00:00
Eric Biggers
125eed0c55 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: 260fe8334e -s ours am: 1931bcbff7 -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: Ib05451f2983ccd5c72a21ae45f17e6ee849cb14b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:45:54 +00:00
Eric Biggers
5677cedd51 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours am: 7b9099571c -s ours am: b2b5920f9a -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: Ia812a03e09559e57b4c27c7a12d98d679562678b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:45:48 +00:00
Eric Biggers
259fdb74ad [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: 2b385e7da2 -s ours am: 8a0045b284 -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: Ied3f73473141b7f6b732cf1ee6533d2a16f4bc95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:17:59 +00:00
Eric Biggers
172991be6a [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: 4241da06f6 -s ours am: 61785ffddd -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: I0185b70bb445911e360d57f5b33fcc60ab6dd920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:15:48 +00:00
Automerger Merge Worker
5a94df0299 Merge "[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: d60572e3ed -s ours" into udc-d1-dev-plus-aosp am: 1eb56a1e47 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: Ib7d0c0944474f076c7c3edb4c1d02b16c2b318a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:12:00 +00:00
Eric Biggers
37816dee32 [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: d60572e3ed -s ours am: 5621f2a1fd -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: I57af4091f5fca015570a0fd2f4cd6d3003748c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:11:55 +00:00
Eric Biggers
f351d2f2d1 [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: 32ba927770 -s ours am: a837b676c9 -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: Ic95867b0a99e719000ce514d0a001974b75495e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:09:07 +00:00
Automerger Merge Worker
8bc7f7ea86 Merge changes from topic "am-26c28ebb54a241eea293a13ad6ca0543" into udc-qpr-dev-plus-aosp
* changes:
  Merge "[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: 57e52a7da8 -s ours" into udc-d1-dev-plus-aosp am: 2df94229d9 -s ours
  [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: 57e52a7da8 -s ours am: c37e45ba7e -s ours
2023-08-08 06:06:22 +00:00
Eric Biggers
090679fdc8 [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: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -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: I5508569ab3ee6ceaf2b4a6df4774750b218dc60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:06:18 +00:00
Eric Biggers
cb6b7e05ec [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: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -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: If44914b447f22245146551cd0767ab67d8be613d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:05:46 +00:00
Automerger Merge Worker
8b90c3dcd2 Merge "[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: 57e52a7da8 -s ours" into udc-d1-dev-plus-aosp am: 2df94229d9 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I1243f3a97096eb86ab7c5512a155e677f4d0f88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:05:35 +00:00
Eric Biggers
6dd275536a [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: 57e52a7da8 -s ours am: c37e45ba7e -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: Id8fc0ac3eadd02e02a7b430c7c0530106ee96506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:05:30 +00:00
Eric Biggers
b6bfcdcabd [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: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -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: Ib8bbb66990597e1f1b894909c924dca48b8e33a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:05:15 +00:00
Eric Biggers
2c8967d76c [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: 4241da06f6 -s ours am: 9c22ad2b3c -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: Ib44433ef43efd11a13a75eca1f3a9bf43a711e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:05:00 +00:00
Automerger Merge Worker
384191b983 Merge "[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: d60572e3ed -s ours am: cdf5989035 -s ours" into udc-qpr-dev-plus-aosp 2023-08-08 06:04:22 +00:00
Automerger Merge Worker
17e17a55c5 Merge changes from topic "am-d3c7160b969d4753a0d372fc1ebd01d5" into udc-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 2e92835b46 -s ours am: a2712b2b5e -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: 50261c4b0a -s ours am: 8861dc9544 -s ours
2023-08-08 06:03:51 +00:00
Eric Biggers
36ea4a7580 [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: d60572e3ed -s ours am: cdf5989035 -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: I1b79355d37cd4a6d9093abfa485e30b635529d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:03:42 +00:00
Eric Biggers
32991b881f [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 2e92835b46 -s ours am: a2712b2b5e -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: I65a21b45f465fc5ef5b014e2d5a942a6555e909a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:03:05 +00:00
Eric Biggers
3d7a67c02d [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: 50261c4b0a -s ours am: 8861dc9544 -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: I47e377345de0abdcb18b0af7cb235a8d2b5ebd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:03:03 +00:00
Eric Biggers
d20b6385f0 [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: 57e52a7da8 -s ours am: ae39fa7e2a -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: Ief253e40a4ca68653a6c0b05c305a29d44453fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:02:56 +00:00
Automerger Merge Worker
93e778592b Merge changes from topic "am-cd5a3cea6b294c4983a26f694f5a5c34" into udc-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: b87c5aa1a9 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours am: 87bbc90fbc -s ours
2023-08-08 06:02:22 +00:00
Eric Biggers
5892ffe6c5 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: b87c5aa1a9 -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: I391fdae7c9f936f82352ae22d52f0d5d3ae03ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:01:44 +00:00
Eric Biggers
e4b84b22a2 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours am: 87bbc90fbc -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: I613f436db76f399cea7da4031ca44e6198c1748f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:01:41 +00:00
Eric Biggers
1931bcbff7 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: 260fe8334e -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: I997010051edf8a420b02685805ffa2ba511fa8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:01:21 +00:00
Eric Biggers
b2b5920f9a [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours am: 7b9099571c -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: I38b879543a962ba25f93ed47c0da4cccf9a511ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 06:01:17 +00:00
Eric Biggers
17fe44ed38 [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: c748718a68 -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: I02219deedf80b230b10a3199e026547bc036aa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 05:25:47 +00:00
Eric Biggers
9c22ad2b3c [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: 4241da06f6 -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: I8a83b0f09d00f791f6965390acb9255472fcc61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 05:24:44 +00:00
Eric Biggers
61785ffddd [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: 4241da06f6 -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: I85f8476bab209983e7bb80de4b2fc9bb38aa678c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 05:24:11 +00:00
Eric Biggers
c593e644db [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: ea0207c908 -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: Ic5bc56b8aa4360e4a7a3befa059c2dbdb963ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 05:24:02 +00:00
Automerger Merge Worker
1eb56a1e47 Merge "[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: d60572e3ed -s ours" into udc-d1-dev-plus-aosp 2023-08-08 05:23:50 +00:00