Sorin Basca
5781b7ab3a
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:55:36 +00:00
Sorin Basca
ea4c4757bb
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Id9c27926a1f4cf518aa4c9b0ba69ed51f7dda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:55:23 +00:00
Sorin Basca
6a043ec5dc
Merge "Use Mockito 4.6.1 API"
2022-07-20 05:32:35 +00:00
Himanshu Rawat
aa1950fd80
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-20 03:33:55 +00:00
Bill Yi
db7f7b6d31
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2ca813a72a28c275eacf6dda32ad36d491aa48b9
2022-07-19 13:59:24 -07:00
Sorin Basca
522bcbd7fc
[automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19334952
Change-Id: Ic39e47f5cdbd5ab6bd6377d14bd8bf2661ebcb22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 12:33:47 +00:00
Sorin Basca
dd00927d16
[automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19334952
Change-Id: I4a89e9c7a5009f1bf6041589bd43b09d0f6f81b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 12:08:10 +00:00
Sorin Basca
e2b0873f9c
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc61e0bcd194
2022-07-19 09:07:28 +00:00
Treehugger Robot
cb4de95600
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: Ia8f4762a938a8b4dc2b8ac503b42792cc3cd882a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 20:43:47 +00:00
TreeHugger Robot
326c0ea30c
[conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291449
Change-Id: Ifce8e49a098d2e745f15348eb2d318d347366e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-16 09:09:57 +00:00
Sorin Basca
b9503775c0
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194
2022-07-16 07:57:52 +01:00
Treehugger Robot
dad4720a31
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: Iaa69c78ca9535382935688f7d9b41724c3f179ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 03:21:01 +00:00
Treehugger Robot
2a0a88af4d
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: I6ba5b7c40e87df6c231e0c774913b1320c9c3996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 02:51:11 +00:00
Treehugger Robot
e705fcd7c3
Merge "Fix incorrect storage calculation when SD card is inserted"
2022-07-16 02:35:19 +00:00
TreeHugger Robot
ac6af411ed
Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp
2022-07-15 21:40:43 +00:00
Sorin Basca
61e0bcd194
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc
2022-07-15 20:05:37 +00:00
TreeHugger Robot
68d4addfdc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: de8d037d68 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I73ae0e9bd563f434af2da30609389bfb33c14f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:41:15 +00:00
Bill Yi
42ae81fed7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 7cb9020b74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: Ice0b1b94f294f49770062d4ddf56b2168ee1063c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:59 +00:00
Bill Yi
c5aff8f391
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: aae3370ac8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I2cd5e38945402505392ee45aad6190a5ae66ff1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:48 +00:00
TreeHugger Robot
086f4d675b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I33b20cdd9764615440073e42f50ac18155eae96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:08:39 +00:00
Bill Yi
b70a1941ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I6948c1dbb6a617b68d55d549e941e75730bce911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:08:22 +00:00
Bill Yi
64ff179b42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I707251703c788ba3f36c2c27f71e2b443ba83a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:08:09 +00:00
TreeHugger Robot
de8d037d68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I5c981979f4d7f49db140616f729a0d1443d3245c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:59 +00:00
Bill Yi
7cb9020b74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: Ic525c959ffa6c69cf17f9d1aa98c3a4ded0dc46e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:44 +00:00
TreeHugger Robot
037a382168
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I416452c5dab106b52086fcf710d08f068a46d237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:42 +00:00
Bill Yi
aae3370ac8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I44bd41d12f2966c1ef8674d3e25484d989b1b314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:31 +00:00
Bill Yi
3df6f3fe63
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I62fefb7372de3f454ec6adc30e240928cad2f618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:24 +00:00
Bill Yi
c25ff8ff49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I521db24cb73bcc39f3b058b45a3fc97397cb514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:04:07 +00:00
TreeHugger Robot
0adac53973
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: I0b9ea4b0881d39ea38a1165d500fcf886dec8388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:03:06 +00:00
Bill Yi
392e976d77
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: I971b4060cd41bf69ce821df160ac5d3434bae041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:02:51 +00:00
Bill Yi
4011a37faa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494
Change-Id: I0a66d2a0bea5d89a31780156c2e9d31356617008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:02:36 +00:00
TreeHugger Robot
8a300a43df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I5ae6a65703afa8f788a107214bb4b64804095e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:56:24 +00:00
Bill Yi
617be8295c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I217b6bffc9e0de61bf00f8291a95d8a2d525243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:56:08 +00:00
Bill Yi
d1f25e5217
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I0f33b849986bb6501baa00d4fee74de7617f9e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:55:55 +00:00
TreeHugger Robot
ec4f2a953b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 3ff66be05a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I4ba7ef3a40991518ba3261282664a9dfdda9e523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:54:57 +00:00
Bill Yi
6f2aa0d0f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: 84ce084f90 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I67f6ad3b81dc663a6ab41c510eb0558f9fdc3840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:54:40 +00:00
Bill Yi
ea80c38015
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: bc5abed2bd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I748899370ed54bc7947644656b8fece6e81dda2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:54:23 +00:00
TreeHugger Robot
f20ec29820
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I7f6106fcdf78ce8f3a335c75a27bf8e794326ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:18 +00:00
Bill Yi
6aa3b0a3a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I989899b2f11e906218ee445f603d46973e88af05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:05 +00:00
Bill Yi
cb2cb2e72a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I39cd22fa5a5ece6def936a0501f4226b5925a414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:36:46 +00:00
TreeHugger Robot
8359385233
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-15 17:29:43 +00:00
TreeHugger Robot
188a2c66c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I07ea1b35c425ddda94d74d61f69d50eac84517b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:37 +00:00
Bill Yi
cdd61bac15
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I43aaa9d814fe81b7bdbcd363f66b214dc7f8949b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:19 +00:00
Bill Yi
3050a6cb87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I0697c0805e26144de9fe00eaaf8fee2ad864f7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:02 +00:00
TreeHugger Robot
3ff66be05a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ia7d530db0b0b29d1f927da0ef723360a69a14b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:19 +00:00
Bill Yi
84ce084f90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ib17ef4b92b91a29d269755ff32c20197c18cfb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:03 +00:00
Bill Yi
bc5abed2bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: Ibdf0138afbf959edefbf88629e3d5f79ac2097c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:24:44 +00:00
TreeHugger Robot
377685d4a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-15 17:19:07 +00:00
TreeHugger Robot
7d8655936b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-15 16:56:40 +00:00
Bill Yi
30c5704504
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8eeb16a4833dccdf9924faefd2b2b341ec2d1da
2022-07-14 13:47:48 -07:00
