Yuanru Qian
22a947a156
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
am: 81343f23fc
am: 945b20c70d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: I0710a54b97a9b230c8802326687d76be7d7a51f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 17:04:28 +00:00
Yuanru Qian
945b20c70d
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
am: 81343f23fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: If6e8d7182b4c6feaca4da62052442f46f930b227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 16:14:39 +00:00
Yuanru Qian
81343f23fc
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: I366f3dddb68df63b2ae251e71610c4d1e33ceefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 15:21:52 +00:00
Yuanru Qian
9ace1904c3
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main
2023-09-12 14:37:23 +00:00
Yuanru Qian
8ffc3c728d
Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS
...
Change-Id: I29c44aec3a9065dd9e0c207faaea55da6ad21471
2023-09-12 07:39:43 +00:00
Bill Yi
aff2aa2b9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-s ours am: 0e9f6de1c9
-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: Iab3f82e8d46af061a634905e0588cc8941142b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 19:03:03 +00:00
Bill Yi
12772adb2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd
-s ours am: cd4f7108da
-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: Ic0a1b3f7c8e40d0fef29b6d987450cbcb1948126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 19:02:47 +00:00
Bill Yi
d0bbda68e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa
-s ours am: 3d3c8da953
-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: I14c22ed25d20942c7bad7b17698382897a9be8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 19:02:31 +00:00
Bill Yi
0e9f6de1c9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-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: I175aa78e54ac3ae4158935874e045599924cf177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 18:08:15 +00:00
Bill Yi
cd4f7108da
[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: Id6b1546c56013193d4a2d5e6bb8de360515a2c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 18:07:59 +00:00
Bill Yi
3d3c8da953
[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: I79f6fb27a5e08c465a25e66bb3e8ee4fd71608b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 18:07:45 +00:00
Bill Yi
7ef30234c5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-s ours am: 74efc70012
-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: I6af7c56deabc1a38f50b14f034ce4d796b151e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:44:37 +00:00
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
74efc70012
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-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: Ia2b0e4dbd0496521a96f53c8fae1fe7a2c1042cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:24:53 +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
9d8a174cfb
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-08 16:49:29 +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