Bill Yi
4a3e643a4e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd
-s ours am: 26761dda7f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: I3ec14be8fba98b124610824dcf791999a9f68b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:44:24 +00:00
Bill Yi
d7897a49f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa
-s ours am: a60c6f5165
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I2a2731e45a1b509ff02239ac9fb2c7b25dc4ad3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:44:09 +00:00
Bill Yi
70a9891a63
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: I469aa5e2d8ce1e52b9cb6794116c503d41bf470b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:37:54 +00:00
Bill Yi
3144cb8a81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: I4c3e13dc09286a5be67a6b556cb7edc98335df29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:37:37 +00:00
Bill Yi
a00e73b28f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24684077
Change-Id: Idaf3f389ee6e746e2bb195bbd3166bf9c6909ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:37:20 +00:00
Bill Yi
26761dda7f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Ia6e4a225e38fcb3dbc783e16731268eefe2ed074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:24:35 +00:00
Bill Yi
a60c6f5165
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I794caf0136c807622ed7e644a3d70338e6b84074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:24:19 +00:00
Bill Yi
fc870f9cfd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-09-08 16:41:46 +00:00
Bill Yi
120f89d40f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311
-s ours am: 269d31645e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691751
Change-Id: Idcffc4bd7d291912a665a549f86d472feb5f4435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 00:36:35 +00:00
Bill Yi
c0e12c874e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc
-s ours am: ebfc5128ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691751
Change-Id: Iffc5c4dab88234629757813c7ff679c3d6bcf27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 00:36:27 +00:00
Bill Yi
610c2167bc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3
-s ours am: a4a56a7fb3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691750
Change-Id: I270a554be450e56d18e46dd2e6f0f86e89ab0965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 00:36:15 +00:00
Bill Yi
18f139a3b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa
-s ours am: c751e145d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691750
Change-Id: I4b1cb6160b47ba11735ea45444efecfe9160c218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 00:36:02 +00:00
Bill Yi
97f0fa1142
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64
-s ours am: 8128682775
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691692
Change-Id: I0476264a7ec431fecb1a7dc47cdb3de4691bd068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 00:35:59 +00:00
Bill Yi
269d31645e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691751
Change-Id: If070041457437f16845b2edc8c61516e60fab697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-07 23:52:52 +00:00
Bill Yi
ebfc5128ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691751
Change-Id: I8ce07c057e0308c0fa6b40b74e368f64c8324f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-07 23:52:39 +00:00
Bill Yi
a4a56a7fb3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691750
Change-Id: I0a1ff34ef0b4f89c90a36ec50e5f1d2230d5202c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-07 23:52:32 +00:00
Bill Yi
c751e145d2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691750
Change-Id: I770162694316efb0427b657facf461c3b45800e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-07 23:52:21 +00:00
Bill Yi
8128682775
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691692
Change-Id: I37b04d6ebb72c2c2634892fb02908f81f115b95d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-07 23:52:07 +00:00
Bill Yi
458e8cc311
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2023-09-07 23:43:06 +00:00
Bill Yi
3d0a8354b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2023-09-07 23:43:06 +00:00
Colin Cross
8f7a1e6f53
Fix kotlin nullable errors in Settings
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
(cherry picked from commit 84f8961e67
)
2023-09-07 17:11:11 +00:00
Bill Yi
0aee5a3e64
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I07e5e02d38b78617cbe7f8a23053d0c15aedd692
2023-09-07 04:18:01 -07:00
Bill Yi
0071351cfc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I79f55f0afe719e019225ea96a442a066ab33e4f3
2023-09-07 04:15:45 -07:00
Bill Yi
219f3c68fa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18aa01b928c2e48302ed95acf15cdeec11c1c3e5
2023-09-07 04:13:48 -07:00
Bill Yi
3152898c4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8be0bcf8a734144099c330c82f335c145ef974f5
2023-09-06 20:57:19 -07:00
Bill Yi
bea9c6fffa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3673e713822da35a1aa64de4aecb0aad5c1d77d2
2023-09-06 20:56:31 -07:00
Bill Yi
1246d3046b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifb278053057291391b9b2554a487b973470b6713
2023-09-06 20:52:13 -07:00
Bill Yi
218dd7dcbd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I40cb57285ddab4f4494479eb2da3fc1ac8cfec5c
2023-09-06 20:50:39 -07:00
Xin Li
21a77533a7
Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11
am: bc31bffab0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146
Change-Id: I9c3a850fbceb22d7e34601288d470eb4fd037723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 20:34:32 +00:00
Xin Li
bc31bffab0
Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146
Change-Id: If887691054dcfe9746687f7d50986dd2c252633e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 19:45:17 +00:00
Xin Li
770a4e1f11
Merge "Merge UP1A.230905.019" into aosp-main-future
2023-09-05 18:35:36 +00:00
Treehugger Robot
c9e0efd5ba
Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
am: 9c21429af4
am: ed9bbf31c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234
Change-Id: I6861bf65677a4d451b53b81993d262230739e482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-04 15:00:12 +00:00
Treehugger Robot
ed9bbf31c9
Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
am: 9c21429af4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234
Change-Id: Ia9c6634870b4c1591804153d9da63b6c13e1cf80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-04 14:10:40 +00:00
Treehugger Robot
9c21429af4
Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234
Change-Id: Idca058c3f3d2de4324d51c9bfd0225cd44c2dbf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-04 13:15:08 +00:00
Treehugger Robot
abe501085b
Merge "Limit bluetooth broadcast password to single byte characters" into main
2023-09-04 12:18:09 +00:00
Jin Dong
a1ae2b1e93
Limit bluetooth broadcast password to single byte characters
...
The bluetooth broadcast password is supposed to be single byte
characters, so crash hanppened when input too many double-byte
characters when connecting to other broadcast.
Limit the password to single byte characters to fix this issue.
Bug: 297840479
Test: Manual
Change-Id: Ifab89ee9a07f20d1f30aba17bed694b5a5da8480
2023-09-04 08:14:10 +00:00
Aleksandr Lukin
7888dfd518
Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347
Change-Id: I92f3ad3e76029f5f0f2caff4e5016a2475decaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 02:27:28 +00:00
Aleksandr Lukin
d1373d4a1a
Merge "Update the API usage to get total size of devices" into udc-d1-dev
2023-09-01 01:41:27 +00:00
Automerger Merge Worker
7ca1b2fec0
Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp
...
* changes:
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: 14b51e0e37
-s ours
2023-08-31 21:33:31 +00:00
Automerger Merge Worker
3a3f389903
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I5e825c033beff24dfbc3f2927a0bbf51cc8e52bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:31:28 +00:00
Automerger Merge Worker
80cc76eda4
Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: f3392e54a5
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours am: 27207b8ba2
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours am: 055f0b6e04
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours am: 108e964377
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours am: 9638eb7317
-s ours
2023-08-31 21:31:17 +00:00
Bill Yi
8dd6eb5801
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: 14b51e0e37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: Iec7a0341be26f883a8abae2e8c3f44828ee08325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:31:14 +00:00
Bill Yi
a63c9b0a73
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce
-s ours am: d1616c60a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: Ibfeadb7c29852872008f7954ee90ef2a34d84adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:47 +00:00
Bill Yi
0cc3b9a425
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe
-s ours am: eaa92efd07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: Ie22e8090f7e5ecc55918cfe95105620015f7eb0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:44 +00:00
Bill Yi
ef8d4e5e6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d
-s ours am: 14442ba7c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I241174454651a7fb0cfabb36d392074c4ac2c5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:39 +00:00
Bill Yi
42d9975494
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593
-s ours am: 9725cfd44b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: Idf2cb2cbcafbdc6928a73e5ee9a9252f7afda607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:24 +00:00
Bill Yi
0b92155672
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d
-s ours am: 34d81dca78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613427
Change-Id: If933aa7e7fbb1840af8ee02a78275e9592e5cc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:05 +00:00
Bill Yi
56d5a70aa0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: f3392e54a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I578e1d4fe45e60b2fde7b7e0d9af9dcf3e38ea27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:27:54 +00:00
Bill Yi
61a2ea9187
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours am: 27207b8ba2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I0cf5906c7ac346384d89e2d90d227db97c1fadd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:27:51 +00:00
Bill Yi
b36cbc1dbe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours am: 055f0b6e04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: Ifce7c8c228f698951d1c2f37bd734bbbdfb0caaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:27:45 +00:00