From 6dbe94fe556ef67f3bbb7d7bb2da3320d68619df Mon Sep 17 00:00:00 2001 From: Mehmet Murat Sevim Date: Wed, 6 Dec 2023 14:54:05 +0000 Subject: Revert "Fix an OOB write bug in attp_build_value_cmd" This reverts commit a0d4425c3964f99f589d449deed2f1bbe520218c. Reason for revert: LE Device name is incorrect after the change. See b/315127634 Change-Id: I93906e7ab768b4015fe3491e171fdb0ec8cf3077 --- system/stack/gatt/att_protocol.cc | 55 ++++++++------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/system/stack/gatt/att_protocol.cc b/system/stack/gatt/att_protocol.cc index 8a4cfe5171..63847db72d 100644 --- a/system/stack/gatt/att_protocol.cc +++ b/system/stack/gatt/att_protocol.cc @@ -280,79 +280,46 @@ static BT_HDR* attp_build_opcode_cmd(uint8_t op_code) { static BT_HDR* attp_build_value_cmd(uint16_t payload_size, uint8_t op_code, uint16_t handle, uint16_t offset, uint16_t len, uint8_t* p_data) { - uint8_t *p, *pp, *p_pair_len; - size_t pair_len; - size_t size_now = 1; - - #define CHECK_SIZE() do { \ - if (size_now > payload_size) { \ - LOG(ERROR) << "payload size too small"; \ - osi_free(p_buf); \ - return nullptr; \ - } \ - } while (false) - + uint8_t *p, *pp, pair_len, *p_pair_len; BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET); p = pp = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; - - CHECK_SIZE(); UINT8_TO_STREAM(p, op_code); p_buf->offset = L2CAP_MIN_OFFSET; + p_buf->len = 1; if (op_code == GATT_RSP_READ_BY_TYPE) { p_pair_len = p; pair_len = len + 2; - size_now += 1; - CHECK_SIZE(); - // this field will be backfilled in the end of this function + UINT8_TO_STREAM(p, pair_len); + p_buf->len += 1; } - if (op_code != GATT_RSP_READ_BLOB && op_code != GATT_RSP_READ) { - size_now += 2; - CHECK_SIZE(); UINT16_TO_STREAM(p, handle); + p_buf->len += 2; } if (op_code == GATT_REQ_PREPARE_WRITE || op_code == GATT_RSP_PREPARE_WRITE) { - size_now += 2; - CHECK_SIZE(); UINT16_TO_STREAM(p, offset); + p_buf->len += 2; } - if (len > 0 && p_data != NULL && payload_size > size_now) { + if (len > 0 && p_data != NULL) { /* ensure data not exceed MTU size */ - if (payload_size - size_now < len) { - len = payload_size - size_now; + if (payload_size - p_buf->len < len) { + len = payload_size - p_buf->len; /* update handle value pair length */ - if (op_code == GATT_RSP_READ_BY_TYPE) { - pair_len = (len + 2); - } + if (op_code == GATT_RSP_READ_BY_TYPE) *p_pair_len = (len + 2); LOG(WARNING) << StringPrintf( "attribute value too long, to be truncated to %d", len); } - size_now += len; - CHECK_SIZE(); ARRAY_TO_STREAM(p, p_data, len); + p_buf->len += len; } - // backfill pair len field - if (op_code == GATT_RSP_READ_BY_TYPE) { - if (pair_len > UINT8_MAX) { - LOG(ERROR) << "pair_len greater than" << UINT8_MAX; - osi_free(p_buf); - return nullptr; - } - - *p_pair_len = (uint8_t) pair_len; - } - - #undef CHECK_SIZE - - p_buf->len = (uint16_t) size_now; return p_buf; } -- cgit v1.2.3-59-g8ed1b From 074b81c0b0352f254735b6bbd60b0501ac55096b Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Fri, 8 Dec 2023 08:13:57 +0000 Subject: Revert "Fix an OOB write bug in attp_build_value_cmd" This reverts commit b927f3fb660dafaf97b2fa0398353a8c39125efc. Reason for revert: b/315127634 Change-Id: I864ea0727c98d6a20c9c0b59aadcaf6720f7fe01 --- system/stack/gatt/att_protocol.cc | 55 ++++++++------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/system/stack/gatt/att_protocol.cc b/system/stack/gatt/att_protocol.cc index 3b68753e85..1a9612f8cf 100644 --- a/system/stack/gatt/att_protocol.cc +++ b/system/stack/gatt/att_protocol.cc @@ -287,79 +287,46 @@ static BT_HDR* attp_build_opcode_cmd(uint8_t op_code) { static BT_HDR* attp_build_value_cmd(uint16_t payload_size, uint8_t op_code, uint16_t handle, uint16_t offset, uint16_t len, uint8_t* p_data) { - uint8_t *p, *pp, *p_pair_len; - size_t pair_len; - size_t size_now = 1; - - #define CHECK_SIZE() do { \ - if (size_now > payload_size) { \ - LOG(ERROR) << "payload size too small"; \ - osi_free(p_buf); \ - return nullptr; \ - } \ - } while (false) - + uint8_t *p, *pp, pair_len, *p_pair_len; BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET); p = pp = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; - - CHECK_SIZE(); UINT8_TO_STREAM(p, op_code); p_buf->offset = L2CAP_MIN_OFFSET; + p_buf->len = 1; if (op_code == GATT_RSP_READ_BY_TYPE) { p_pair_len = p; pair_len = len + 2; - size_now += 1; - CHECK_SIZE(); - // this field will be backfilled in the end of this function + UINT8_TO_STREAM(p, pair_len); + p_buf->len += 1; } - if (op_code != GATT_RSP_READ_BLOB && op_code != GATT_RSP_READ) { - size_now += 2; - CHECK_SIZE(); UINT16_TO_STREAM(p, handle); + p_buf->len += 2; } if (op_code == GATT_REQ_PREPARE_WRITE || op_code == GATT_RSP_PREPARE_WRITE) { - size_now += 2; - CHECK_SIZE(); UINT16_TO_STREAM(p, offset); + p_buf->len += 2; } - if (len > 0 && p_data != NULL && payload_size > size_now) { + if (len > 0 && p_data != NULL) { /* ensure data not exceed MTU size */ - if (payload_size - size_now < len) { - len = payload_size - size_now; + if (payload_size - p_buf->len < len) { + len = payload_size - p_buf->len; /* update handle value pair length */ - if (op_code == GATT_RSP_READ_BY_TYPE) { - pair_len = (len + 2); - } + if (op_code == GATT_RSP_READ_BY_TYPE) *p_pair_len = (len + 2); LOG(WARNING) << StringPrintf( "attribute value too long, to be truncated to %d", len); } - size_now += len; - CHECK_SIZE(); ARRAY_TO_STREAM(p, p_data, len); + p_buf->len += len; } - // backfill pair len field - if (op_code == GATT_RSP_READ_BY_TYPE) { - if (pair_len > UINT8_MAX) { - LOG(ERROR) << "pair_len greater than" << UINT8_MAX; - osi_free(p_buf); - return nullptr; - } - - *p_pair_len = (uint8_t) pair_len; - } - - #undef CHECK_SIZE - - p_buf->len = (uint16_t) size_now; return p_buf; } -- cgit v1.2.3-59-g8ed1b From 4ae5e736813bf2928bfc8c71e3dacf3b78394046 Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Tue, 29 Aug 2023 12:05:45 -0700 Subject: Reland: Fix an OOB write bug in attp_build_value_cmd Bug: 295887535 Bug: 315127634 Test: m com.android.btservices Test: atest net_test_stack_gatt Ignore-AOSP-First: security Merged-In: I291fd665a68d90813b8c21c80d23cc438f84f285 Change-Id: I291fd665a68d90813b8c21c80d23cc438f84f285 --- system/stack/gatt/att_protocol.cc | 56 +++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/system/stack/gatt/att_protocol.cc b/system/stack/gatt/att_protocol.cc index 29ceec2673..c8c6f2422a 100644 --- a/system/stack/gatt/att_protocol.cc +++ b/system/stack/gatt/att_protocol.cc @@ -286,46 +286,80 @@ static BT_HDR* attp_build_opcode_cmd(uint8_t op_code) { static BT_HDR* attp_build_value_cmd(uint16_t payload_size, uint8_t op_code, uint16_t handle, uint16_t offset, uint16_t len, uint8_t* p_data) { - uint8_t *p, *pp, pair_len, *p_pair_len; + uint8_t *p, *pp, *p_pair_len; + size_t pair_len; + size_t size_now = 1; + +#define CHECK_SIZE() \ + do { \ + if (size_now > payload_size) { \ + LOG_ERROR("payload size too small"); \ + osi_free(p_buf); \ + return nullptr; \ + } \ + } while (false) + BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET); p = pp = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; + + CHECK_SIZE(); UINT8_TO_STREAM(p, op_code); p_buf->offset = L2CAP_MIN_OFFSET; - p_buf->len = 1; if (op_code == GATT_RSP_READ_BY_TYPE) { - p_pair_len = p; + p_pair_len = p++; pair_len = len + 2; - UINT8_TO_STREAM(p, pair_len); - p_buf->len += 1; + size_now += 1; + CHECK_SIZE(); + // this field will be backfilled in the end of this function } + if (op_code != GATT_RSP_READ_BLOB && op_code != GATT_RSP_READ) { + size_now += 2; + CHECK_SIZE(); UINT16_TO_STREAM(p, handle); - p_buf->len += 2; } if (op_code == GATT_REQ_PREPARE_WRITE || op_code == GATT_RSP_PREPARE_WRITE) { + size_now += 2; + CHECK_SIZE(); UINT16_TO_STREAM(p, offset); - p_buf->len += 2; } if (len > 0 && p_data != NULL) { /* ensure data not exceed MTU size */ - if (payload_size - p_buf->len < len) { - len = payload_size - p_buf->len; + if (payload_size - size_now < len) { + len = payload_size - size_now; /* update handle value pair length */ - if (op_code == GATT_RSP_READ_BY_TYPE) *p_pair_len = (len + 2); + if (op_code == GATT_RSP_READ_BY_TYPE) { + pair_len = (len + 2); + } LOG(WARNING) << StringPrintf( "attribute value too long, to be truncated to %d", len); } + size_now += len; + CHECK_SIZE(); ARRAY_TO_STREAM(p, p_data, len); - p_buf->len += len; } + // backfill pair len field + if (op_code == GATT_RSP_READ_BY_TYPE) { + if (pair_len > UINT8_MAX) { + LOG_ERROR("pair_len greater than %d", UINT8_MAX); + osi_free(p_buf); + return nullptr; + } + + *p_pair_len = (uint8_t)pair_len; + } + +#undef CHECK_SIZE + + p_buf->len = (uint16_t)size_now; return p_buf; } -- cgit v1.2.3-59-g8ed1b From 09e48e0d5377ef56a556f9f05ed3e3e97849475e Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Tue, 29 Aug 2023 12:05:45 -0700 Subject: Reland: Fix an OOB write bug in attp_build_value_cmd Bug: 295887535 Bug: 315127634 Test: m com.android.btservices Test: atest net_test_stack_gatt Ignore-AOSP-First: security Flag: EXEMPT, security fix for Q1-2024 Change-Id: I291fd665a68d90813b8c21c80d23cc438f84f285 --- system/stack/gatt/att_protocol.cc | 56 +++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/system/stack/gatt/att_protocol.cc b/system/stack/gatt/att_protocol.cc index ab69b27668..9e65210341 100644 --- a/system/stack/gatt/att_protocol.cc +++ b/system/stack/gatt/att_protocol.cc @@ -286,46 +286,80 @@ static BT_HDR* attp_build_opcode_cmd(uint8_t op_code) { static BT_HDR* attp_build_value_cmd(uint16_t payload_size, uint8_t op_code, uint16_t handle, uint16_t offset, uint16_t len, uint8_t* p_data) { - uint8_t *p, *pp, pair_len, *p_pair_len; + uint8_t *p, *pp, *p_pair_len; + size_t pair_len; + size_t size_now = 1; + +#define CHECK_SIZE() \ + do { \ + if (size_now > payload_size) { \ + LOG_ERROR("payload size too small"); \ + osi_free(p_buf); \ + return nullptr; \ + } \ + } while (false) + BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET); p = pp = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; + + CHECK_SIZE(); UINT8_TO_STREAM(p, op_code); p_buf->offset = L2CAP_MIN_OFFSET; - p_buf->len = 1; if (op_code == GATT_RSP_READ_BY_TYPE) { - p_pair_len = p; + p_pair_len = p++; pair_len = len + 2; - UINT8_TO_STREAM(p, pair_len); - p_buf->len += 1; + size_now += 1; + CHECK_SIZE(); + // this field will be backfilled in the end of this function } + if (op_code != GATT_RSP_READ_BLOB && op_code != GATT_RSP_READ) { + size_now += 2; + CHECK_SIZE(); UINT16_TO_STREAM(p, handle); - p_buf->len += 2; } if (op_code == GATT_REQ_PREPARE_WRITE || op_code == GATT_RSP_PREPARE_WRITE) { + size_now += 2; + CHECK_SIZE(); UINT16_TO_STREAM(p, offset); - p_buf->len += 2; } if (len > 0 && p_data != NULL) { /* ensure data not exceed MTU size */ - if (payload_size - p_buf->len < len) { - len = payload_size - p_buf->len; + if (payload_size - size_now < len) { + len = payload_size - size_now; /* update handle value pair length */ - if (op_code == GATT_RSP_READ_BY_TYPE) *p_pair_len = (len + 2); + if (op_code == GATT_RSP_READ_BY_TYPE) { + pair_len = (len + 2); + } LOG(WARNING) << StringPrintf( "attribute value too long, to be truncated to %d", len); } + size_now += len; + CHECK_SIZE(); ARRAY_TO_STREAM(p, p_data, len); - p_buf->len += len; } + // backfill pair len field + if (op_code == GATT_RSP_READ_BY_TYPE) { + if (pair_len > UINT8_MAX) { + LOG_ERROR("pair_len greater than %d", UINT8_MAX); + osi_free(p_buf); + return nullptr; + } + + *p_pair_len = (uint8_t)pair_len; + } + +#undef CHECK_SIZE + + p_buf->len = (uint16_t)size_now; return p_buf; } -- cgit v1.2.3-59-g8ed1b From e076b3dccb129ab561dad1c2a26e8160d613b693 Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Tue, 19 Dec 2023 13:30:13 -0800 Subject: Add additional test for attp_build_value_cmd focusing on security (OOB) Bug: 295887535 Bug: 315127634 Test: m com.android.btservices Test: atest net_test_stack_gatt Ignore-AOSP-First: security Flag: EXEMPT, Test Change-Id: I63071c6166b7ca0f3b90a8feadb9133887e26d3a --- system/stack/test/gatt/stack_gatt_test.cc | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/system/stack/test/gatt/stack_gatt_test.cc b/system/stack/test/gatt/stack_gatt_test.cc index fe1f474dde..1466a9c6bd 100644 --- a/system/stack/test/gatt/stack_gatt_test.cc +++ b/system/stack/test/gatt/stack_gatt_test.cc @@ -333,3 +333,50 @@ TEST_F(StackGattTest, attp_build_value_cmd_full_p_data) { 0x1234, 3, (uint8_t*)"abc"); } } + +static void attp_build_value_cmd_small_payload_size(uint8_t op_code) { + // payload size too small + uint16_t offset_0 = 0; + uint16_t handle = 0x1; + uint16_t len = 0; + uint8_t* p_data = nullptr; + uint16_t test_payload_size = gatt_min_value_cmd_size.at(op_code) - 1; + + ASSERT_TRUE(gatt_min_value_cmd_size.find(op_code) != + gatt_min_value_cmd_size.end()); + test_payload_size = gatt_min_value_cmd_size.at(op_code) - 1; + + BT_HDR* ret = bluetooth::legacy::testing::attp_build_value_cmd( + test_payload_size, op_code, handle, offset_0, len, p_data); + + ASSERT_EQ(ret, nullptr); +} + +TEST_F(StackGattTest, + attp_build_value_cmd_test_payload_size_less_than_mimimal) { + for (auto it = gatt_min_value_cmd_size.begin(); + it != gatt_min_value_cmd_size.end(); it++) { + attp_build_value_cmd_small_payload_size(it->first); + } +} + +TEST_F(StackGattTest, attp_build_value_cmd_read_by_type_test_long_data) { + // p_data too large and does not fit in pair_len + // only for GATT_RSP_READ_BY_TYPE + uint16_t offset_0 = 0; + uint16_t handle = 0x1; + const uint8_t op_code = GATT_RSP_READ_BY_TYPE; + + const int data_size = 255; + uint16_t payload_size = data_size + 4; + + uint8_t data[data_size]; + + for (int i = 0; i < data_size; i++) { + data[i] = 'A'; + } + + BT_HDR* ret = bluetooth::legacy::testing::attp_build_value_cmd( + payload_size, op_code, handle, offset_0, data_size, data); + ASSERT_EQ(ret, nullptr); +} -- cgit v1.2.3-59-g8ed1b From 8e11ec72113162e9ad8e2635379cd319abdfe8fa Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 26 Dec 2023 14:49:59 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I3a415da67060ada00f29f15d17d3c9015b429f1c --- android/app/res/values-hi/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/res/values-hi/strings.xml b/android/app/res/values-hi/strings.xml index 03c8c3ccfd..ddc21efe85 100644 --- a/android/app/res/values-hi/strings.xml +++ b/android/app/res/values-hi/strings.xml @@ -77,7 +77,7 @@ "इस प्रकार की फ़ाइल प्रबंधित करने के लिए कोई ऐप्लिकेशन नहीं है. \n" "कोई फ़ाइल नहीं" "फ़ाइल मौजूद नहीं है. \n" - "कृपया प्रतीक्षा करें..." + "कृपया इंतज़ार करें..." "ब्लूटूथ चालू कर रहा है…" "फ़ाइल मिलेगी. सूचना पैनल में प्रगति देखें." "फ़ाइल पाई नहीं जा सकती." -- cgit v1.2.3-59-g8ed1b From 693da154d7918548af979e7558ae4176cd4c78e5 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 26 Dec 2023 14:50:24 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I624305157917f407b8dfd3e5a240f1cbb3e99c85 --- android/app/res/values-hi/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/res/values-hi/strings.xml b/android/app/res/values-hi/strings.xml index 6c9941f95c..cbe6acb6be 100644 --- a/android/app/res/values-hi/strings.xml +++ b/android/app/res/values-hi/strings.xml @@ -76,7 +76,7 @@ "इस प्रकार की फ़ाइल प्रबंधित करने के लिए कोई ऐप्लिकेशन नहीं है. \n" "कोई फ़ाइल नहीं" "फ़ाइल मौजूद नहीं है. \n" - "कृपया प्रतीक्षा करें..." + "कृपया इंतज़ार करें..." "ब्लूटूथ चालू कर रहा है…" "फ़ाइल मिलेगी. सूचना पैनल में प्रगति देखें." "फ़ाइल पाई नहीं जा सकती." -- cgit v1.2.3-59-g8ed1b From 504453903e0be36bf8d5e0db0d3a4178aa2d26d0 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 26 Dec 2023 14:50:48 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I36ae066bd78e856a1c35b6a7978a2b23f1894dce --- android/app/res/values-hi/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/res/values-hi/strings.xml b/android/app/res/values-hi/strings.xml index 03c8c3ccfd..ddc21efe85 100644 --- a/android/app/res/values-hi/strings.xml +++ b/android/app/res/values-hi/strings.xml @@ -77,7 +77,7 @@ "इस प्रकार की फ़ाइल प्रबंधित करने के लिए कोई ऐप्लिकेशन नहीं है. \n" "कोई फ़ाइल नहीं" "फ़ाइल मौजूद नहीं है. \n" - "कृपया प्रतीक्षा करें..." + "कृपया इंतज़ार करें..." "ब्लूटूथ चालू कर रहा है…" "फ़ाइल मिलेगी. सूचना पैनल में प्रगति देखें." "फ़ाइल पाई नहीं जा सकती." -- cgit v1.2.3-59-g8ed1b From 176b63e0921fd0252ae1a479876d31ce35fd64b5 Mon Sep 17 00:00:00 2001 From: Vova Sharaienko Date: Wed, 3 Jan 2024 00:15:54 +0000 Subject: [statsd] Remove static variants of libstatssocket/pull Bug: 162108043 Test: atest net_test_btif Ignore-AOSP-First: resolve merge conflicts Change-Id: Icee2ee2a4e17798f72879f44139ee0cb1fd48c74 --- system/btif/Android.bp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/system/btif/Android.bp b/system/btif/Android.bp index 9fb04855ac..01c01631ca 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -28,22 +28,16 @@ cc_library { "com.android.btservices", ], min_sdk_version: "30", + shared_libs: [ + "libstatssocket", + ], + export_shared_lib_headers: [ + "libstatssocket", + ], target: { - android: { - shared_libs: [ - "libstatssocket", - ], - export_shared_lib_headers: [ - "libstatssocket", - ], - }, host: { static_libs: [ "libbase", - "libstatssocket", - ], - export_static_lib_headers: [ - "libstatssocket", ], }, darwin: { -- cgit v1.2.3-59-g8ed1b From 62944f39f502b28687a5142ec2d77585525591bc Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Thu, 4 Jan 2024 06:27:52 +0000 Subject: Fix a security bypass issue in access_secure_service_from_temp_bond Bug: 318374503 Test: m com.android.btservices | manual test against PoC | QA Ignore-AOSP-First: security Merged-In: I48df2c2d77810077e97d4131540277273d441998 Change-Id: I48df2c2d77810077e97d4131540277273d441998 --- system/stack/btm/btm_sec.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index 3af24dd59c..944eef2759 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -222,8 +222,7 @@ static bool access_secure_service_from_temp_bond(const tBTM_SEC_DEV_REC* p_dev_r bool locally_initiated, uint16_t security_req) { return !locally_initiated && (security_req & BTM_SEC_IN_AUTHENTICATE) && - p_dev_rec->is_device_authenticated() && - p_dev_rec->is_bond_type_temporary(); + p_dev_rec->is_bond_type_temporary(); } /******************************************************************************* -- cgit v1.2.3-59-g8ed1b From 75d6ec5fcd9e2ed4804e83552dd3de792eadfc81 Mon Sep 17 00:00:00 2001 From: Vova Sharaienko Date: Wed, 3 Jan 2024 00:15:54 +0000 Subject: [statsd] Remove static variants of libstatssocket/pull Bug: 162108043 Test: atest net_test_btif Ignore-AOSP-First: resolve merge conflicts Change-Id: Icee2ee2a4e17798f72879f44139ee0cb1fd48c74 Merged-In: Icee2ee2a4e17798f72879f44139ee0cb1fd48c74 --- system/btif/Android.bp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/system/btif/Android.bp b/system/btif/Android.bp index 61441672d1..4ac1a85267 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -42,22 +42,16 @@ cc_library { "com.android.btservices", ], min_sdk_version: "30", + shared_libs: [ + "libstatssocket", + ], + export_shared_lib_headers: [ + "libstatssocket", + ], target: { - android: { - shared_libs: [ - "libstatssocket", - ], - export_shared_lib_headers: [ - "libstatssocket", - ], - }, host: { static_libs: [ "libbase", - "libstatssocket", - ], - export_static_lib_headers: [ - "libstatssocket", ], }, darwin: { -- cgit v1.2.3-59-g8ed1b From 9402b43e919b3706d33a4534e13468b95896b5c5 Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Thu, 4 Jan 2024 06:27:52 +0000 Subject: Fix a security bypass issue in access_secure_service_from_temp_bond Bug: 318374503 Test: m com.android.btservices | manual test against PoC | QA Flag: EXEMPT, urgent security fix Ignore-AOSP-First: security Change-Id: I48df2c2d77810077e97d4131540277273d441998 --- system/stack/btm/btm_sec.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index 1138d7f7a1..6d6bf4e960 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -267,7 +267,6 @@ static bool access_secure_service_from_temp_bond(const tBTM_SEC_DEV_REC* p_dev_r bool locally_initiated, uint16_t security_req) { return !locally_initiated && (security_req & BTM_SEC_IN_AUTHENTICATE) && - p_dev_rec->sec_rec.is_device_authenticated() && p_dev_rec->sec_rec.is_bond_type_temporary(); } -- cgit v1.2.3-59-g8ed1b From d030609a61ac01e99b8f29cbaab8d8482a2cf9e8 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 11 Jan 2024 20:15:01 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ibe7057bbab255467ebd429a4f38418abaa0e0c84 --- android/app/res/values-af/strings.xml | 1 - android/app/res/values-am/strings.xml | 1 - android/app/res/values-ar/strings.xml | 1 - android/app/res/values-as/strings.xml | 1 - android/app/res/values-az/strings.xml | 1 - android/app/res/values-b+sr+Latn/strings.xml | 1 - android/app/res/values-be/strings.xml | 1 - android/app/res/values-bg/strings.xml | 1 - android/app/res/values-bn/strings.xml | 1 - android/app/res/values-bs/strings.xml | 1 - android/app/res/values-ca/strings.xml | 1 - android/app/res/values-cs/strings.xml | 1 - android/app/res/values-da/strings.xml | 1 - android/app/res/values-de/strings.xml | 1 - android/app/res/values-el/strings.xml | 1 - android/app/res/values-en-rAU/strings.xml | 1 - android/app/res/values-en-rCA/strings.xml | 1 - android/app/res/values-en-rGB/strings.xml | 1 - android/app/res/values-en-rIN/strings.xml | 1 - android/app/res/values-en-rXC/strings.xml | 1 - android/app/res/values-es-rUS/strings.xml | 1 - android/app/res/values-es/strings.xml | 1 - android/app/res/values-et/strings.xml | 1 - android/app/res/values-eu/strings.xml | 1 - android/app/res/values-fa/strings.xml | 1 - android/app/res/values-fi/strings.xml | 1 - android/app/res/values-fr-rCA/strings.xml | 1 - android/app/res/values-fr/strings.xml | 1 - android/app/res/values-gl/strings.xml | 1 - android/app/res/values-gu/strings.xml | 1 - android/app/res/values-hi/strings.xml | 1 - android/app/res/values-hr/strings.xml | 1 - android/app/res/values-hu/strings.xml | 1 - android/app/res/values-hy/strings.xml | 1 - android/app/res/values-in/strings.xml | 1 - android/app/res/values-is/strings.xml | 1 - android/app/res/values-it/strings.xml | 1 - android/app/res/values-iw/strings.xml | 1 - android/app/res/values-ja/strings.xml | 1 - android/app/res/values-ka/strings.xml | 1 - android/app/res/values-kk/strings.xml | 1 - android/app/res/values-km/strings.xml | 1 - android/app/res/values-kn/strings.xml | 1 - android/app/res/values-ko/strings.xml | 1 - android/app/res/values-ky/strings.xml | 1 - android/app/res/values-lo/strings.xml | 1 - android/app/res/values-lt/strings.xml | 1 - android/app/res/values-lv/strings.xml | 1 - android/app/res/values-mk/strings.xml | 1 - android/app/res/values-ml/strings.xml | 1 - android/app/res/values-mn/strings.xml | 1 - android/app/res/values-mr/strings.xml | 1 - android/app/res/values-ms/strings.xml | 1 - android/app/res/values-my/strings.xml | 1 - android/app/res/values-nb/strings.xml | 1 - android/app/res/values-ne/strings.xml | 1 - android/app/res/values-nl/strings.xml | 1 - android/app/res/values-or/strings.xml | 1 - android/app/res/values-pa/strings.xml | 1 - android/app/res/values-pl/strings.xml | 1 - android/app/res/values-pt-rPT/strings.xml | 1 - android/app/res/values-pt/strings.xml | 1 - android/app/res/values-ro/strings.xml | 1 - android/app/res/values-ru/strings.xml | 1 - android/app/res/values-si/strings.xml | 1 - android/app/res/values-sk/strings.xml | 1 - android/app/res/values-sl/strings.xml | 1 - android/app/res/values-sq/strings.xml | 1 - android/app/res/values-sr/strings.xml | 1 - android/app/res/values-sv/strings.xml | 1 - android/app/res/values-sw/strings.xml | 1 - android/app/res/values-ta/strings.xml | 1 - android/app/res/values-te/strings.xml | 1 - android/app/res/values-th/strings.xml | 1 - android/app/res/values-tl/strings.xml | 1 - android/app/res/values-tr/strings.xml | 1 - android/app/res/values-uk/strings.xml | 1 - android/app/res/values-ur/strings.xml | 1 - android/app/res/values-uz/strings.xml | 1 - android/app/res/values-vi/strings.xml | 1 - android/app/res/values-zh-rCN/strings.xml | 1 - android/app/res/values-zh-rHK/strings.xml | 1 - android/app/res/values-zh-rTW/strings.xml | 1 - android/app/res/values-zu/strings.xml | 1 - 84 files changed, 84 deletions(-) diff --git a/android/app/res/values-af/strings.xml b/android/app/res/values-af/strings.xml index 425476f691..b6fafebadc 100644 --- a/android/app/res/values-af/strings.xml +++ b/android/app/res/values-af/strings.xml @@ -101,7 +101,6 @@ "Verbinding onsuksesvol." "Versoek kan nie korrek hanteer word nie." "Onbekende fout" - "Ontvang deur Bluetooth" "Bluetooth-deling" "%1$s volledig ontvang." "%1$s klaar gestuur." diff --git a/android/app/res/values-am/strings.xml b/android/app/res/values-am/strings.xml index 4b23792a97..a0307883cc 100644 --- a/android/app/res/values-am/strings.xml +++ b/android/app/res/values-am/strings.xml @@ -101,7 +101,6 @@ "ተያያዥ አልተሳካም።" "ጥየቃውን በትክክል መያዝ አይቻልም።" "ያልታወቀ ስህተት" - "ብሉቱዝ ተቀብሏል" "የብሉቱዝ ማጋሪያ" "%1$s ተቀብሎ ተጠናቋል።" "%1$s ልኮ ተጠናቋል።" diff --git a/android/app/res/values-ar/strings.xml b/android/app/res/values-ar/strings.xml index 7106e0638d..32103139b7 100644 --- a/android/app/res/values-ar/strings.xml +++ b/android/app/res/values-ar/strings.xml @@ -101,7 +101,6 @@ "لم يتم الاتصال بنجاح." "لا يمكن معالجة الطلب بشكل صحيح." "خطأ غير معروف." - "ملفات بلوتوث المستلَمة" "مشاركة البلوتوث" "اكتمل استلام %1$s." "اكتمل إرسال %1$s." diff --git a/android/app/res/values-as/strings.xml b/android/app/res/values-as/strings.xml index 020d1b73a3..077255117b 100644 --- a/android/app/res/values-as/strings.xml +++ b/android/app/res/values-as/strings.xml @@ -101,7 +101,6 @@ "সংযোগ কৰিব পৰা নগ\'ল।" "অনুৰোধ সঠিকভাৱে পৰিচালনা কৰিব নোৱাৰি।" "অজ্ঞাত আসোঁৱাহ।" - "ব্লুটুথ লাভ কৰা হ’ল" "ব্লুটুথ শ্বেয়াৰ" "%1$s লাভ কৰা কাৰ্য সম্পূৰ্ণ হ’ল।" "%1$s প্ৰেৰণ কৰা কাম সম্পূৰ্ণ হ’ল" diff --git a/android/app/res/values-az/strings.xml b/android/app/res/values-az/strings.xml index 5d1599f998..3a005fc3de 100644 --- a/android/app/res/values-az/strings.xml +++ b/android/app/res/values-az/strings.xml @@ -101,7 +101,6 @@ "Uğursuz bağlantı." "Sorğu düzgün idarə edilə bilməz." "Naməlum xəta." - "Bluetooth ilə qəbul edilənlər" "Bluetooth Paylaşım" "%1$s tam qəbul olundu." "%1$s tam göndərildi." diff --git a/android/app/res/values-b+sr+Latn/strings.xml b/android/app/res/values-b+sr+Latn/strings.xml index 6dce442877..72fae4bb58 100644 --- a/android/app/res/values-b+sr+Latn/strings.xml +++ b/android/app/res/values-b+sr+Latn/strings.xml @@ -101,7 +101,6 @@ "Povezivanje nije uspelo." "Nije moguće ispravno obraditi zahtev." "Nepoznata greška." - "Primljeno preko Bluetooth-a" "Deljenje preko Bluetooth-a" "%1$s Primljeno u celosti." "%1$s Slanje je dovršeno." diff --git a/android/app/res/values-be/strings.xml b/android/app/res/values-be/strings.xml index 9a2a1f9f12..ae610a6208 100644 --- a/android/app/res/values-be/strings.xml +++ b/android/app/res/values-be/strings.xml @@ -101,7 +101,6 @@ "Няўдалая спроба падключэння." "Запыт не можа быць правільна апрацаваны" "Невядомая памылка." - "Атрыманае праз Bluetooth" "Абагульванне праз Bluetooth" "Атрыманне завершанае: %1$s." "Адпраўленне завершана: %1$s." diff --git a/android/app/res/values-bg/strings.xml b/android/app/res/values-bg/strings.xml index 5ec8326d74..54226c3deb 100644 --- a/android/app/res/values-bg/strings.xml +++ b/android/app/res/values-bg/strings.xml @@ -101,7 +101,6 @@ "Връзката не е успешна." "Заявката не може да бъде обработена правилно." "Неизвестна грешка." - "Получено с Bluetooth" "Споделяне през Bluetooth" "%1$s – Получаването завърши." "%1$s – Изпращането завърши." diff --git a/android/app/res/values-bn/strings.xml b/android/app/res/values-bn/strings.xml index e4c139f13e..2ced67bb33 100644 --- a/android/app/res/values-bn/strings.xml +++ b/android/app/res/values-bn/strings.xml @@ -101,7 +101,6 @@ "সংযোগ অসফল।" "অনুরোধ সঠিকভাবে পরিচালনা করা যাবে না।" "অজানা ত্রুটি৷" - "ব্লুটুথ প্রাপ্তি" "ব্লুটুথ শেয়ার" "%1$s প্রাপ্ত করা সম্পূর্ণ।" "%1$s পাঠানো সম্পূর্ণ।" diff --git a/android/app/res/values-bs/strings.xml b/android/app/res/values-bs/strings.xml index 69cbb3c0b3..4622a522b9 100644 --- a/android/app/res/values-bs/strings.xml +++ b/android/app/res/values-bs/strings.xml @@ -101,7 +101,6 @@ "Povezivanje nije uspjelo." "Nije moguće pravilno obraditi zahtjev." "Nepoznata greška." - "Primljeno putem Bluetootha" "Dijeljenje putem Bluetootha" "%1$s Primanje završeno." "%1$s Slanje dovršeno." diff --git a/android/app/res/values-ca/strings.xml b/android/app/res/values-ca/strings.xml index 3ee27e5eed..97b7df5baa 100644 --- a/android/app/res/values-ca/strings.xml +++ b/android/app/res/values-ca/strings.xml @@ -101,7 +101,6 @@ "Connexió incorrecta." "La sol·licitud no es pot processar correctament." "Error desconegut." - "Rebut per Bluetooth" "Compartir amb Bluetooth" "Recepció completada (%1$s)" "%1$s: enviament complet." diff --git a/android/app/res/values-cs/strings.xml b/android/app/res/values-cs/strings.xml index 656778a08b..817b5af537 100644 --- a/android/app/res/values-cs/strings.xml +++ b/android/app/res/values-cs/strings.xml @@ -101,7 +101,6 @@ "Připojení se nezdařilo." "Požadavek není možné správně zpracovat." "Neznámá chyba." - "Bluetooth – přijaté soubory" "Sdílení Bluetooth" "%1$s Přijetí dokončeno." "%1$s Odeslání dokončeno." diff --git a/android/app/res/values-da/strings.xml b/android/app/res/values-da/strings.xml index 5142cdaebd..0b64b50d2f 100644 --- a/android/app/res/values-da/strings.xml +++ b/android/app/res/values-da/strings.xml @@ -101,7 +101,6 @@ "Forbindelsen mislykkedes." "Anmodningen kan ikke håndteres korrekt." "Ukendt fejl." - "Modtaget via Bluetooth" "Bluetooth-deling" "%1$s Modtaget." "%1$s Afsendelse fuldført." diff --git a/android/app/res/values-de/strings.xml b/android/app/res/values-de/strings.xml index 7f23b5186c..0f9cb2b0b8 100644 --- a/android/app/res/values-de/strings.xml +++ b/android/app/res/values-de/strings.xml @@ -101,7 +101,6 @@ "Verbindung fehlgeschlagen" "Die Anfrage kann nicht richtig verarbeitet werden." "Unbekannter Fehler" - "Per Bluetooth empfangen" "Bluetooth-Freigabe" "%1$s vollständig empfangen." "%1$s vollständig gesendet." diff --git a/android/app/res/values-el/strings.xml b/android/app/res/values-el/strings.xml index ada53d395c..6913efeb59 100644 --- a/android/app/res/values-el/strings.xml +++ b/android/app/res/values-el/strings.xml @@ -101,7 +101,6 @@ "Η σύνδεση δεν ήταν επιτυχής." "Δεν μπορεί να γίνει σωστός χειρισμός του αιτήματος." "Άγνωστο σφάλμα." - "Ελήφθη μέσω Bluetooth" "Μοιραστείτε μέσω Bluetooth" "Ελήφθησαν πλήρως %1$s." "Ολοκληρώθηκε η αποστολή %1$s." diff --git a/android/app/res/values-en-rAU/strings.xml b/android/app/res/values-en-rAU/strings.xml index 73ffd04a0c..63b65fdd3c 100644 --- a/android/app/res/values-en-rAU/strings.xml +++ b/android/app/res/values-en-rAU/strings.xml @@ -101,7 +101,6 @@ "Connection unsuccessful." "Request can\'t be handled correctly." "Unknown error." - "Bluetooth received" "Bluetooth Share" "%1$s Received complete." "%1$s Sent complete." diff --git a/android/app/res/values-en-rCA/strings.xml b/android/app/res/values-en-rCA/strings.xml index bbba4a440a..08c08ce2c9 100644 --- a/android/app/res/values-en-rCA/strings.xml +++ b/android/app/res/values-en-rCA/strings.xml @@ -101,7 +101,6 @@ "Connection unsuccessful." "Request can\'t be handled correctly." "Unknown error." - "Bluetooth received" "Bluetooth Share" "%1$s Received complete." "%1$s Sent complete." diff --git a/android/app/res/values-en-rGB/strings.xml b/android/app/res/values-en-rGB/strings.xml index 73ffd04a0c..63b65fdd3c 100644 --- a/android/app/res/values-en-rGB/strings.xml +++ b/android/app/res/values-en-rGB/strings.xml @@ -101,7 +101,6 @@ "Connection unsuccessful." "Request can\'t be handled correctly." "Unknown error." - "Bluetooth received" "Bluetooth Share" "%1$s Received complete." "%1$s Sent complete." diff --git a/android/app/res/values-en-rIN/strings.xml b/android/app/res/values-en-rIN/strings.xml index 73ffd04a0c..63b65fdd3c 100644 --- a/android/app/res/values-en-rIN/strings.xml +++ b/android/app/res/values-en-rIN/strings.xml @@ -101,7 +101,6 @@ "Connection unsuccessful." "Request can\'t be handled correctly." "Unknown error." - "Bluetooth received" "Bluetooth Share" "%1$s Received complete." "%1$s Sent complete." diff --git a/android/app/res/values-en-rXC/strings.xml b/android/app/res/values-en-rXC/strings.xml index c81c28b3ac..7252063f0f 100644 --- a/android/app/res/values-en-rXC/strings.xml +++ b/android/app/res/values-en-rXC/strings.xml @@ -101,7 +101,6 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎Connection unsuccessful.‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎Request can\'t be handled correctly.‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎Unknown error.‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎Bluetooth received‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎Bluetooth Share‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎ Received complete.‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎ Sent complete.‎‏‎‎‏‎" diff --git a/android/app/res/values-es-rUS/strings.xml b/android/app/res/values-es-rUS/strings.xml index 8a10bd5c3b..efa8782e2f 100644 --- a/android/app/res/values-es-rUS/strings.xml +++ b/android/app/res/values-es-rUS/strings.xml @@ -101,7 +101,6 @@ "Conexión incorrecta" "No se puede procesar la solicitud correctamente." "Error desconocido" - "Recibido por Bluetooth" "Compartir por Bluetooth" "Se recibieron %1$s completos." "%1$s enviados por completo." diff --git a/android/app/res/values-es/strings.xml b/android/app/res/values-es/strings.xml index 48cf103ec4..f797d30d9e 100644 --- a/android/app/res/values-es/strings.xml +++ b/android/app/res/values-es/strings.xml @@ -101,7 +101,6 @@ "Conexión incorrecta" "No se puede procesar la solicitud correctamente." "Error desconocido" - "Recibido por Bluetooth" "Bluetooth Share" "Recepción de %1$s completada" "Envío de %1$s completado" diff --git a/android/app/res/values-et/strings.xml b/android/app/res/values-et/strings.xml index 52a5fdf10a..627ef39f50 100644 --- a/android/app/res/values-et/strings.xml +++ b/android/app/res/values-et/strings.xml @@ -101,7 +101,6 @@ "Ühendus ebaõnnestus." "Taotlust ei saa õigesti käsitleda." "Tundmatu viga." - "Bluetoothiga vastu võetud" "Jagamine Bluetoothiga" "%1$s vastuvõtmine lõpetatud." "%1$s saatmine lõpetatud." diff --git a/android/app/res/values-eu/strings.xml b/android/app/res/values-eu/strings.xml index 64e721afa7..cadf3ef312 100644 --- a/android/app/res/values-eu/strings.xml +++ b/android/app/res/values-eu/strings.xml @@ -101,7 +101,6 @@ "Ezin izan da konektatu." "Ezin da eskaera behar bezala kudeatu." "Errore ezezaguna." - "Bluetooth bidez jasotakoak" "Bluetooth bidez partekatzea" "%1$s jaso dira osorik." "%1$s osorik bidali da." diff --git a/android/app/res/values-fa/strings.xml b/android/app/res/values-fa/strings.xml index e72edd954d..b6163c637c 100644 --- a/android/app/res/values-fa/strings.xml +++ b/android/app/res/values-fa/strings.xml @@ -101,7 +101,6 @@ "اتصال ناموفق بود." "درخواست به درستی انجام نمی‌شود." "خطای ناشناس." - "بلوتوث دریافت شد" "اشتراکگذاری بلوتوث" "%1$s دریافت کامل شد." "%1$s ارسال کامل شد." diff --git a/android/app/res/values-fi/strings.xml b/android/app/res/values-fi/strings.xml index 8f33c50ce9..39069a6161 100644 --- a/android/app/res/values-fi/strings.xml +++ b/android/app/res/values-fi/strings.xml @@ -101,7 +101,6 @@ "Yhteys epäonnistui." "Pyyntö ei ole käsiteltävissä." "Tuntematon virhe." - "Bluetooth, vastaanotettu" "Bluetooth-jako" "%1$s vastaanotto valmis." "%1$s lähetys valmis." diff --git a/android/app/res/values-fr-rCA/strings.xml b/android/app/res/values-fr-rCA/strings.xml index 1884953ea5..46eea189da 100644 --- a/android/app/res/values-fr-rCA/strings.xml +++ b/android/app/res/values-fr-rCA/strings.xml @@ -101,7 +101,6 @@ "Échec de la connexion." "Impossible de traiter la demande correctement." "Erreur inconnue." - "Reçu par Bluetooth" "Partage Bluetooth" "Réception de %1$s terminée" "Envoi de %1$s terminé" diff --git a/android/app/res/values-fr/strings.xml b/android/app/res/values-fr/strings.xml index 321d505f74..1072b8bb33 100644 --- a/android/app/res/values-fr/strings.xml +++ b/android/app/res/values-fr/strings.xml @@ -101,7 +101,6 @@ "Échec de la connexion." "Impossible de traiter la demande correctement." "Erreur inconnue." - "Reçus via Bluetooth" "Partage Bluetooth" "Réception de %1$s terminée" "Envoi de %1$s terminé" diff --git a/android/app/res/values-gl/strings.xml b/android/app/res/values-gl/strings.xml index 5f43ed3148..fc6ad69a4f 100644 --- a/android/app/res/values-gl/strings.xml +++ b/android/app/res/values-gl/strings.xml @@ -101,7 +101,6 @@ "Conexión incorrecta" "A solicitude non se pode atender correctamente." "Erro descoñecido" - "Recibido por Bluetooth" "Uso compartido por Bluetooth" "%1$s: recepción completa." "Envío de %1$s completado." diff --git a/android/app/res/values-gu/strings.xml b/android/app/res/values-gu/strings.xml index 1f2a403c2b..a97789cd24 100644 --- a/android/app/res/values-gu/strings.xml +++ b/android/app/res/values-gu/strings.xml @@ -101,7 +101,6 @@ "કનેક્શન અસફળ." "વિનંતી યોગ્ય રીતે હેન્ડલ કરી શકાતી નથી." "અજાણી ભૂલ." - "બ્લૂટૂથથી મળેલી ફાઇલો" "બ્લૂટૂથ શેર" "%1$s પ્રાપ્તિ પૂર્ણ" "%1$s મોકલવું પૂર્ણ." diff --git a/android/app/res/values-hi/strings.xml b/android/app/res/values-hi/strings.xml index ddc21efe85..c9067a50e2 100644 --- a/android/app/res/values-hi/strings.xml +++ b/android/app/res/values-hi/strings.xml @@ -101,7 +101,6 @@ "कनेक्‍शन विफल." "अनुरोध को सही तरह से प्रबंधित नहीं किया जा सकता." "अज्ञात गड़बड़ी‍." - "ब्लूटूथ से मिली फ़ाइलें" "ब्लूटूथ के ज़रिए शेयर" "%1$s मिलना पूरा हुआ." "%1$s भेजना पूरा हुआ." diff --git a/android/app/res/values-hr/strings.xml b/android/app/res/values-hr/strings.xml index a0782a3f49..d58de00187 100644 --- a/android/app/res/values-hr/strings.xml +++ b/android/app/res/values-hr/strings.xml @@ -101,7 +101,6 @@ "Neuspješno povezivanje." "Zahtjev nije moguće ispravno obraditi." "Nepoznata pogreška." - "Primljeno Bluetoothom" "Dijeljenje Bluetoothom" "%1$s primljeno u cijelosti." "%1$s Poslano u potpunosti." diff --git a/android/app/res/values-hu/strings.xml b/android/app/res/values-hu/strings.xml index f6dd025e86..3af5b97385 100644 --- a/android/app/res/values-hu/strings.xml +++ b/android/app/res/values-hu/strings.xml @@ -101,7 +101,6 @@ "A kapcsolódás sikertelen." "A kérést nem lehet megfelelően kezelni." "Ismeretlen hiba." - "Fogadás Bluetooth-on keresztül" "Bluetooth-megosztás" "%1$s A fogadás kész." "%1$s A küldés kész.." diff --git a/android/app/res/values-hy/strings.xml b/android/app/res/values-hy/strings.xml index 9802113046..25d55fcea6 100644 --- a/android/app/res/values-hy/strings.xml +++ b/android/app/res/values-hy/strings.xml @@ -101,7 +101,6 @@ "Միացումը անհաջող էր:" "Հարցումը հնարավոր չէ ճշգրտորեն մշակել:" "Անհայտ սխալ:" - "Bluetooth-ով ստացված" "Bluetooth-ով փոխանցում" "%1$s ստացումն ավարտված է:" "%1$s ուղարկումն ավարտված է:" diff --git a/android/app/res/values-in/strings.xml b/android/app/res/values-in/strings.xml index e6c31b9f38..dcfc4bb8f7 100644 --- a/android/app/res/values-in/strings.xml +++ b/android/app/res/values-in/strings.xml @@ -101,7 +101,6 @@ "Sambungan tidak berhasil." "Permintaan tidak dapat ditangani dengan semestinya." "Kesalahan tidak dikenal." - "Bluetooth diterima" "Berbagi via Bluetooth" "%1$s Telah selesai diterima." "%1$s Telah selesai dikirim." diff --git a/android/app/res/values-is/strings.xml b/android/app/res/values-is/strings.xml index 667a6cb752..5f6bb2275b 100644 --- a/android/app/res/values-is/strings.xml +++ b/android/app/res/values-is/strings.xml @@ -101,7 +101,6 @@ "Tenging mistókst." "Ekki er hægt að afgreiða beiðnina á réttan hátt." "Óþekkt villa." - "Móttekið um Bluetooth" "Bluetooth-deiling" "Móttöku %1$s lokið." "Sendingu %1$s lokið." diff --git a/android/app/res/values-it/strings.xml b/android/app/res/values-it/strings.xml index 73c7df5943..2c06b240d8 100644 --- a/android/app/res/values-it/strings.xml +++ b/android/app/res/values-it/strings.xml @@ -101,7 +101,6 @@ "Connessione non riuscita." "Impossibile gestire correttamente la richiesta." "Errore sconosciuto." - "Ricevuti tramite Bluetooth" "Condivisione Bluetooth" "Ricezione completata (%1$s)" "Invio completato (%1$s)" diff --git a/android/app/res/values-iw/strings.xml b/android/app/res/values-iw/strings.xml index 288935f50d..c3ee301fee 100644 --- a/android/app/res/values-iw/strings.xml +++ b/android/app/res/values-iw/strings.xml @@ -101,7 +101,6 @@ "החיבור נכשל." "לא ניתן לטפל בבקשה כהלכה." "שגיאה לא ידועה." - "‏קבצים שהתקבלו דרך Bluetooth" "‏שיתוף Bluetooth" "%1$s שהתקבלו הושלמו." "%1$s שנשלחו הושלמו." diff --git a/android/app/res/values-ja/strings.xml b/android/app/res/values-ja/strings.xml index 39782962a8..3eb1588a23 100644 --- a/android/app/res/values-ja/strings.xml +++ b/android/app/res/values-ja/strings.xml @@ -101,7 +101,6 @@ "接続できませんでした。" "リクエストを正しく処理できません。" "不明なエラーです。" - "Bluetooth で受信したファイル" "Bluetooth 共有" "%1$sの受信が完了しました。" "%1$sの送信が完了しました。" diff --git a/android/app/res/values-ka/strings.xml b/android/app/res/values-ka/strings.xml index a46b7283b0..9ddb66ef97 100644 --- a/android/app/res/values-ka/strings.xml +++ b/android/app/res/values-ka/strings.xml @@ -101,7 +101,6 @@ "კავშირი ვერ განხორციელდა." "მოთხოვნის სწორად დამუშავება ვერ ხერხდება." "უცნობი შეცდომა." - "Bluetooth-ით მიღებული" "Bluetooth გაზიარება" "%1$s მიღება დასრულდა." "%1$s გაგზავნა დასრულდა." diff --git a/android/app/res/values-kk/strings.xml b/android/app/res/values-kk/strings.xml index 4a977f3717..a19e286775 100644 --- a/android/app/res/values-kk/strings.xml +++ b/android/app/res/values-kk/strings.xml @@ -101,7 +101,6 @@ "Байланыс сәтсіз болды." "Өтінішті дұрыс орындау мүмкін емес." "Белгісіз қателік." - "Bluetooth арқылы алынғандар" "Bluetooth бөлісу" "%1$s Толығымен қабылданды." "%1$s Жіберіліп болды." diff --git a/android/app/res/values-km/strings.xml b/android/app/res/values-km/strings.xml index c785fd29f3..c17e0eb5e5 100644 --- a/android/app/res/values-km/strings.xml +++ b/android/app/res/values-km/strings.xml @@ -101,7 +101,6 @@ "ការ​តភ្ជាប់​​មិន​ជោគជ័យ​។" "មិន​អាច​ដោះស្រាយ​សំណើ​​​​ដោយ​ត្រឹមត្រូវ​ទេ។" "មិន​ស្គាល់​កំហុស។" - "​បាន​ទទួលតាម​​ប៊្លូ​ធូ​ស" "ការ​ចែករំលែក​ប៊្លូ​ធូ​ស" "បាន​ទទួល​ពេញ​លេញ %1$s ។" "បាន​ផ្ញើ​ពេញ​លេញ %1$s ។" diff --git a/android/app/res/values-kn/strings.xml b/android/app/res/values-kn/strings.xml index 0e0ecd2ff0..3a344bef35 100644 --- a/android/app/res/values-kn/strings.xml +++ b/android/app/res/values-kn/strings.xml @@ -101,7 +101,6 @@ "ಸಂಪರ್ಕವು ವಿಫಲವಾಗಿದೆ." "ವಿನಂತಿಯನ್ನು ಸರಿಯಾಗಿ ನಿರ್ವಹಿಸಲಾಗುವುದಿಲ್ಲ." "ಅಪರಿಚಿತ ದೋಷ." - "ಬ್ಲೂಟೂತ್‌ ಸ್ವೀಕರಿಸಲಾಗಿದೆ" "ಬ್ಲೂಟೂತ್‌ ಹಂಚಿಕೆ" "%1$s ಸ್ವೀಕರಿಸುವುದು ಪೂರ್ಣಗೊಂಡಿದೆ." "%1$s ಕಳುಹಿಸುವುದು ಪೂರ್ಣಗೊಂಡಿದೆ." diff --git a/android/app/res/values-ko/strings.xml b/android/app/res/values-ko/strings.xml index 2995916a07..f06cdebde0 100644 --- a/android/app/res/values-ko/strings.xml +++ b/android/app/res/values-ko/strings.xml @@ -101,7 +101,6 @@ "연결하지 못했습니다." "요청을 제대로 처리할 수 없습니다." "알 수 없는 오류입니다." - "블루투스로 받은 파일" "블루투스 공유" "%1$s 수신을 완료했습니다." "%1$s 전송을 완료했습니다." diff --git a/android/app/res/values-ky/strings.xml b/android/app/res/values-ky/strings.xml index f5bcd7526c..526285cbe3 100644 --- a/android/app/res/values-ky/strings.xml +++ b/android/app/res/values-ky/strings.xml @@ -101,7 +101,6 @@ "Байланышкан жок." "Сурамды туура иштетүү мүмкүн эмес." "Белгисиз ката." - "Bluetooth аркылуу алынгандар" "Bluetooth аркылуу бөлүшүү" "Бардыгы кабыл алынды: %1$s." "Бардыгы жөнөтүлдү: %1$s." diff --git a/android/app/res/values-lo/strings.xml b/android/app/res/values-lo/strings.xml index 7068a289af..f32b40f560 100644 --- a/android/app/res/values-lo/strings.xml +++ b/android/app/res/values-lo/strings.xml @@ -101,7 +101,6 @@ "ການເຊື່ອມຕໍ່ບໍ່ສຳເລັດຜົນ" "ການຮ້ອງຂໍບໍ່ສາມາດຖືກຈັດການໄດ້ຢ່າງຖືກຕ້ອງ." "ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ." - "ໄຟລ໌ທີ່ໄດ້ຮັບແລ້ວຈາກ Bluetooth" "ແບ່ງປັນໃນ Bluetooth" "%1$s ໄດ້ຮັບຮຽບຮ້ອຍແລ້ວ." "%1$s ຖືກສົ່ງສຳເລັດແລ້ວ." diff --git a/android/app/res/values-lt/strings.xml b/android/app/res/values-lt/strings.xml index 1851fef1cb..c87bb0431d 100644 --- a/android/app/res/values-lt/strings.xml +++ b/android/app/res/values-lt/strings.xml @@ -101,7 +101,6 @@ "Nepavyko užmegzti ryšio." "Nepavyksta tinkamai apdoroti užklausos." "Nežinoma klaida." - "„Bluetooth“ gauta" "„Bluetooth“ bendrinimas" "%1$s gauta." "%1$s išsiųsta." diff --git a/android/app/res/values-lv/strings.xml b/android/app/res/values-lv/strings.xml index 431013fa66..48ab462cae 100644 --- a/android/app/res/values-lv/strings.xml +++ b/android/app/res/values-lv/strings.xml @@ -101,7 +101,6 @@ "Neizdevās izveidot savienojumu." "Pieprasījumu nevar pareizi apstrādāt." "Nezināma kļūda." - "Bluetooth saņemtie faili" "Bluetooth kopīgošana" "Faila %1$s saņemšana pabeigta." "Faila %1$s sūtīšana ir pabeigta." diff --git a/android/app/res/values-mk/strings.xml b/android/app/res/values-mk/strings.xml index 383808d3a0..06aff8ce98 100644 --- a/android/app/res/values-mk/strings.xml +++ b/android/app/res/values-mk/strings.xml @@ -101,7 +101,6 @@ "Врската е неуспешна." "Барањето не може да се обработи правилно." "Непозната грешка." - "Прием од Bluetooth" "Споделено преку Bluetooth" "%1$s Примањето е завршено." "%1$s Праќањето е завршено." diff --git a/android/app/res/values-ml/strings.xml b/android/app/res/values-ml/strings.xml index bd3d6660f0..a716527572 100644 --- a/android/app/res/values-ml/strings.xml +++ b/android/app/res/values-ml/strings.xml @@ -101,7 +101,6 @@ "കണക്ഷൻ പരാജയപ്പെട്ടു." "അഭ്യർത്ഥന ശരിയായി കൈകാര്യം ചെയ്യാനാകില്ല." "അജ്ഞാത പിശക്." - "Bluetooth-ലൂടെ ലഭിച്ചവ" "Bluetooth പങ്കിടൽ" "%1$s നേടൽ പൂർത്തിയായി." "%1$s അയച്ചത് പൂർത്തിയായി." diff --git a/android/app/res/values-mn/strings.xml b/android/app/res/values-mn/strings.xml index 5f76295016..373314b82a 100644 --- a/android/app/res/values-mn/strings.xml +++ b/android/app/res/values-mn/strings.xml @@ -101,7 +101,6 @@ "Холболт амжилтгүй." "Хүсэлтийг зөв гүйцэтгэх боломжгүй." "Тодорхойгүй алдаа." - "Bluetooth хүлээж авсан" "Bluetooth хуваалцах" "%1$s Бүрэн хүлээж авсан." "%1$s Илгээж дууссан." diff --git a/android/app/res/values-mr/strings.xml b/android/app/res/values-mr/strings.xml index 0162bfae10..6a3ebcce31 100644 --- a/android/app/res/values-mr/strings.xml +++ b/android/app/res/values-mr/strings.xml @@ -101,7 +101,6 @@ "कनेक्‍शन अयशस्‍वी." "विनंती योग्य रीतीने हाताळली जाऊ शकत नाही." "अज्ञात एरर" - "ब्लूटूथ मिळवले" "ब्लूटूथ शेअर" "%1$s प्राप्त करणे पूर्ण." "%1$s पाठविणे पूर्ण." diff --git a/android/app/res/values-ms/strings.xml b/android/app/res/values-ms/strings.xml index 195866c6aa..331b40d9e9 100644 --- a/android/app/res/values-ms/strings.xml +++ b/android/app/res/values-ms/strings.xml @@ -101,7 +101,6 @@ "Sambungan tidak berjaya." "Permintaan tidak dapat dikendalikan dengan betul." "Ralat tidak diketahui." - "Bluetooth diterima" "Perkongsian Bluetooth" "%1$s Penerimaan selesai." "%1$s Penghantaran selesai." diff --git a/android/app/res/values-my/strings.xml b/android/app/res/values-my/strings.xml index 295afd15ae..34f0aa4d6c 100644 --- a/android/app/res/values-my/strings.xml +++ b/android/app/res/values-my/strings.xml @@ -101,7 +101,6 @@ "ချိတ်ဆက်ခြင်း မအောင်မြင်ပါ" "တောင်းခံခြင်းကို မှန်ကန်စွာကိုင်တွယ်မရပါ" "အမည်မသိသော မှားယွင်းမှု" - "ဘလူးတုသ် လက်ခံရပြီး" "ဘလူးတုသ် မျှဝေမှု" "%1$s လက်ခံရရှိပြီး" "%1$s ပို့ခြင်း ပြီးဆုံးပြီး" diff --git a/android/app/res/values-nb/strings.xml b/android/app/res/values-nb/strings.xml index f158684085..1915382505 100644 --- a/android/app/res/values-nb/strings.xml +++ b/android/app/res/values-nb/strings.xml @@ -101,7 +101,6 @@ "Tilkobling mislyktes." "Kan ikke behandle forespørsel på riktig måte." "Ukjent feil." - "Bluetooth mottatt" "Bluetooth-deling" "%1$s mottatt – ferdig." "%1$s sendt." diff --git a/android/app/res/values-ne/strings.xml b/android/app/res/values-ne/strings.xml index 87729300f0..f39ec07666 100644 --- a/android/app/res/values-ne/strings.xml +++ b/android/app/res/values-ne/strings.xml @@ -101,7 +101,6 @@ "जडान असफल।" "अनुरोधलाई सही रूपमा सम्हाल्न सकिँदैन।" "अज्ञात त्रुटि।" - "ब्लुटुथबाट प्राप्त भएको" "ब्लुटुथमार्फत गरिने आदान प्रदान" "%1$s प्राप्त गर्ने कार्य सम्पन्न भयो।" "%1$s पठाउने कार्य पुरा भयो।" diff --git a/android/app/res/values-nl/strings.xml b/android/app/res/values-nl/strings.xml index cbda859d06..e59f12ff15 100644 --- a/android/app/res/values-nl/strings.xml +++ b/android/app/res/values-nl/strings.xml @@ -101,7 +101,6 @@ "Verbinding mislukt." "Het verzoek kan niet correct worden verwerkt." "Onbekende fout." - "Ontvangen via bluetooth" "Delen via bluetooth" "%1$s ontvangen voltooid." "%1$s verzonden voltooid." diff --git a/android/app/res/values-or/strings.xml b/android/app/res/values-or/strings.xml index 920ca675d6..0f4ab29f05 100644 --- a/android/app/res/values-or/strings.xml +++ b/android/app/res/values-or/strings.xml @@ -101,7 +101,6 @@ "ସଂଯୋଗ ବିଫଳ ହେଲା।" "ଅନୁରୋଧକୁ ଠିକ୍‌ ଭାବେ ସମ୍ଭାଳି ହେବନାହିଁ।" "ଅଜଣା ତୃଟି।" - "ବ୍ଲୁଟୁଥ ପ୍ରାପ୍ତ ହୋଇଛି" "ବ୍ଲୁଟୂଥ୍‍‌ ସେୟାର୍‌" "%1$s ପ୍ରାପ୍ତ କରିବା ସମ୍ପୂର୍ଣ୍ଣ ହେଲା।" "%1$s ପଠାଇବା ସମ୍ପୂର୍ଣ୍ଣ ହେଲା।" diff --git a/android/app/res/values-pa/strings.xml b/android/app/res/values-pa/strings.xml index c4258cc308..9de8f2c5de 100644 --- a/android/app/res/values-pa/strings.xml +++ b/android/app/res/values-pa/strings.xml @@ -101,7 +101,6 @@ "ਕਨੈਕਸ਼ਨ ਅਸਫਲ।" "ਬੇਨਤੀ ਨੂੰ ਸਹੀ ਢੰਗ ਨਾਲ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।" "ਅਗਿਆਤ ਅਸ਼ੁੱਧੀ।" - "ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਪ੍ਰਾਪਤ" "ਬਲੂਟੁੱਥ ਸਾਂਝਾਕਰਨ" "%1$s ਪੂਰਾ ਪ੍ਰਾਪਤ ਕੀਤਾ।" "%1$s ਪੂਰਾ ਭੇਜਿਆ ਗਿਆ।" diff --git a/android/app/res/values-pl/strings.xml b/android/app/res/values-pl/strings.xml index d8ef0a41f8..0a13478c42 100644 --- a/android/app/res/values-pl/strings.xml +++ b/android/app/res/values-pl/strings.xml @@ -101,7 +101,6 @@ "Nie można połączyć." "Nie można poprawnie obsłużyć żądania." "Nieznany błąd." - "Odebrane przez Bluetooth" "Udostępnianie Bluetooth" "Odbieranie %1$s zakończono." "Wysyłanie %1$s zakończono." diff --git a/android/app/res/values-pt-rPT/strings.xml b/android/app/res/values-pt-rPT/strings.xml index db13dd6009..8768870eda 100644 --- a/android/app/res/values-pt-rPT/strings.xml +++ b/android/app/res/values-pt-rPT/strings.xml @@ -101,7 +101,6 @@ "A ligação falhou." "Não é possível processar o pedido corretamente." "Erro desconhecido." - "Bluetooth recebido" "Partilha por Bluetooth" "Recepção completa de %1$s." "Envio de %1$s concluído" diff --git a/android/app/res/values-pt/strings.xml b/android/app/res/values-pt/strings.xml index 68260daa6a..4d7c2cb8fe 100644 --- a/android/app/res/values-pt/strings.xml +++ b/android/app/res/values-pt/strings.xml @@ -101,7 +101,6 @@ "Falha na conexão." "Não é possível tratar a solicitação corretamente." "Erro desconhecido." - "Recebido por Bluetooth" "Envio por Bluetooth" "%1$s Recebimento concluído." "%1$s Envio concluído." diff --git a/android/app/res/values-ro/strings.xml b/android/app/res/values-ro/strings.xml index e54f39f37d..3b3aa67476 100644 --- a/android/app/res/values-ro/strings.xml +++ b/android/app/res/values-ro/strings.xml @@ -101,7 +101,6 @@ "Conectare eșuată." "Solicitarea nu poate fi gestionată corect." "Eroare necunoscută." - "Bluetooth recepționat" "Distribuire prin Bluetooth" "Primire finalizată: %1$s." "Trimitere finalizată: %1$s." diff --git a/android/app/res/values-ru/strings.xml b/android/app/res/values-ru/strings.xml index 37047a0da3..fa5f5d9cd9 100644 --- a/android/app/res/values-ru/strings.xml +++ b/android/app/res/values-ru/strings.xml @@ -101,7 +101,6 @@ "Не удалось установить соединение." "Невозможно правильно обработать запрос." "Неизвестная ошибка" - "Получено по Bluetooth" "Передача по Bluetooth" "Получено: %1$s." "Отправлено: %1$s." diff --git a/android/app/res/values-si/strings.xml b/android/app/res/values-si/strings.xml index 26a964f9e7..3221011e3e 100644 --- a/android/app/res/values-si/strings.xml +++ b/android/app/res/values-si/strings.xml @@ -101,7 +101,6 @@ "සම්බන්ධය අසාර්ථකයි." "ඉල්ලීම නිවැරදිව හැසිරවීමට නොහැකිය." "නොදන්නා දෝෂයකි." - "බ්ලූටූත් ලැබිණි" "බ්ලූටූත් බෙදා ගැනීම" "%1$s ලැබීම සම්පූර්ණයි." "%1$s යැවීම සම්පූර්ණයි." diff --git a/android/app/res/values-sk/strings.xml b/android/app/res/values-sk/strings.xml index d67347b4de..9d434619fb 100644 --- a/android/app/res/values-sk/strings.xml +++ b/android/app/res/values-sk/strings.xml @@ -101,7 +101,6 @@ "Neúspešný pokus o pripojenie." "Žiadosť nie je možné správne spracovať." "Neznáma chyba." - "Prijaté cez Bluetooth" "Zdieľanie Bluetooth" "%1$s, príjem dokončený" "%1$s Odosielanie dokončené." diff --git a/android/app/res/values-sl/strings.xml b/android/app/res/values-sl/strings.xml index 3946c0cabe..8fbcfcaae5 100644 --- a/android/app/res/values-sl/strings.xml +++ b/android/app/res/values-sl/strings.xml @@ -101,7 +101,6 @@ "Povezava neuspešna." "Zahteve ni mogoče pravilno obravnavati." "Neznana napaka." - "Bluetooth – prejeto" "Deljenje prek Bluetootha" "%1$s Prejemanje je končano." "%1$s Pošiljanje je dokončano." diff --git a/android/app/res/values-sq/strings.xml b/android/app/res/values-sq/strings.xml index f3ed014bfe..429884ad61 100644 --- a/android/app/res/values-sq/strings.xml +++ b/android/app/res/values-sq/strings.xml @@ -101,7 +101,6 @@ "Lidhja ishte e pasuksesshme." "Kërkesa nuk mund të trajtohet si duhet." "Gabim i panjohur." - "Marrjet përmes Bluetooth-it" "Ndarja përmes \"Bluetooth-it\"" "%1$s - Marrja përfundoi." "%1$s Dërgimi përfundoi." diff --git a/android/app/res/values-sr/strings.xml b/android/app/res/values-sr/strings.xml index b851eb1595..27f0f9b82f 100644 --- a/android/app/res/values-sr/strings.xml +++ b/android/app/res/values-sr/strings.xml @@ -101,7 +101,6 @@ "Повезивање није успело." "Није могуће исправно обрадити захтев." "Непозната грешка." - "Примљено преко Bluetooth-а" "Дељење преко Bluetooth-а" "%1$s Примљено у целости." "%1$s Слање је довршено." diff --git a/android/app/res/values-sv/strings.xml b/android/app/res/values-sv/strings.xml index a197bdaba3..07f3b9e7d8 100644 --- a/android/app/res/values-sv/strings.xml +++ b/android/app/res/values-sv/strings.xml @@ -101,7 +101,6 @@ "Anslutningen misslyckades." "Begäran kan inte hanteras korrekt." "Okänt fel." - "Mottaget via Bluetooth" "Bluetooth-delning" "%1$s har tagits emot fullständigt." "%1$s har skickats fullständigt." diff --git a/android/app/res/values-sw/strings.xml b/android/app/res/values-sw/strings.xml index 29768f66af..077674ec95 100644 --- a/android/app/res/values-sw/strings.xml +++ b/android/app/res/values-sw/strings.xml @@ -101,7 +101,6 @@ "Muunganisho haujafanikiwa." "Ombi haliwezi kushughulikiwa kwa usahihi." "Hitilafu isiyojulikana." - "Zilizopokewa kupitia Bluetooth" "Shiriki Bluetooth" "%1$s Imepokelewa kikamilifu" "Kutuma kwa %1$s kumekamilika." diff --git a/android/app/res/values-ta/strings.xml b/android/app/res/values-ta/strings.xml index 6e040191dd..137ec5c408 100644 --- a/android/app/res/values-ta/strings.xml +++ b/android/app/res/values-ta/strings.xml @@ -101,7 +101,6 @@ "இணைப்பு தோல்வி." "கோரிக்கை சரியாக கையாளப்படவில்லை." "தெரியாத பிழை." - "புளூடூத் - பெற்றவை" "புளூடூத் பகிர்வு" "%1$s பெறப்பட்டது." "%1$s அனுப்புவது முடிந்தது." diff --git a/android/app/res/values-te/strings.xml b/android/app/res/values-te/strings.xml index 788a186927..b0de0b5c1b 100644 --- a/android/app/res/values-te/strings.xml +++ b/android/app/res/values-te/strings.xml @@ -101,7 +101,6 @@ "కనెక్షన్ విఫలమైంది." "రిక్వెస్ట్‌ సరిగ్గా నిర్వహించబడదు." "తెలియని ఎర్రర్." - "బ్లూటూత్‌తో స్వీకరించినవి" "బ్లూటూత్ షేర్" "%1$s స్వీకరించడం పూర్తయింది." "%1$s పంపడం పూర్తయింది." diff --git a/android/app/res/values-th/strings.xml b/android/app/res/values-th/strings.xml index c23e367888..c4cf4a42c8 100644 --- a/android/app/res/values-th/strings.xml +++ b/android/app/res/values-th/strings.xml @@ -101,7 +101,6 @@ "การเชื่อมต่อไม่สำเร็จ" "ไม่สามารถจัดการคำขอได้อย่างถูกต้อง" "ข้อผิดพลาดที่ไม่ทราบสาเหตุ" - "ไฟล์ที่ได้รับแล้วผ่านบลูทูธ" "การแชร์ทางบลูทูธ" "ได้รับแล้ว %1$s" "ส่ง %1$s เรียบร้อยแล้ว" diff --git a/android/app/res/values-tl/strings.xml b/android/app/res/values-tl/strings.xml index aeffc11a9d..ab10130515 100644 --- a/android/app/res/values-tl/strings.xml +++ b/android/app/res/values-tl/strings.xml @@ -101,7 +101,6 @@ "Hindi matagumpay ang koneksyon." "Hindi mapangasiwaan nang tama ang kahilingan." "Hindi kilalang error." - "Natanggap sa bluetooth" "Pagbabahagi sa Bluetooth" "%1$s Kumpleto na ang pagtanggap." "%1$s Kumpleto na ang pagpapadala." diff --git a/android/app/res/values-tr/strings.xml b/android/app/res/values-tr/strings.xml index 020bb4f494..cc35f66b8d 100644 --- a/android/app/res/values-tr/strings.xml +++ b/android/app/res/values-tr/strings.xml @@ -101,7 +101,6 @@ "Bağlantı başarısız." "İstek düzgün bir şekilde işlenemiyor." "Bilinmeyen hata." - "Bluetooth ile alınanlar" "Bluetooth Paylaşımı" "%1$s Alma tamamlandı." "%1$s Gönderme tamamlandı." diff --git a/android/app/res/values-uk/strings.xml b/android/app/res/values-uk/strings.xml index 244246df51..96901555d2 100644 --- a/android/app/res/values-uk/strings.xml +++ b/android/app/res/values-uk/strings.xml @@ -101,7 +101,6 @@ "Помилка з’єднання." "Запит неможливо обробити належним чином." "Невідома помилка." - "Отримані через Bluetooth" "Обмін даними через Bluetooth" "Завершено отримання %1$s." "Заверш. надсил. %1$s." diff --git a/android/app/res/values-ur/strings.xml b/android/app/res/values-ur/strings.xml index 36ce6b90b1..9602e202ae 100644 --- a/android/app/res/values-ur/strings.xml +++ b/android/app/res/values-ur/strings.xml @@ -101,7 +101,6 @@ "کنکشن ناکام ہو گیا۔" "درخواست کو ٹھیک سے ہینڈل نہیں کیا جا سکتا۔" "نامعلوم خرابی۔" - "بلوٹوتھ کے ذریعے موصول کردہ" "بلوٹوتھ اشتراک" "%1$s وصولی مکمل۔" "%1$s بھیجنا مکمل ہو گیا۔" diff --git a/android/app/res/values-uz/strings.xml b/android/app/res/values-uz/strings.xml index d456f10b11..de0031674f 100644 --- a/android/app/res/values-uz/strings.xml +++ b/android/app/res/values-uz/strings.xml @@ -101,7 +101,6 @@ "Ulanish muvaffaqiyatsiz yakunlandi." "So‘rovni to‘g‘ri bajarib bo‘lmaydi." "Noma’lum xato." - "Bluetooth orqali olingan" "Bluetooth uzatmalari" "To‘liq qabul qilindi: %1$s" "To‘liq yuborildi: %1$s" diff --git a/android/app/res/values-vi/strings.xml b/android/app/res/values-vi/strings.xml index 61ae148f2d..be5235ec4b 100644 --- a/android/app/res/values-vi/strings.xml +++ b/android/app/res/values-vi/strings.xml @@ -101,7 +101,6 @@ "Kết nối không thành công." "Không thể xử lý yêu cầu đúng cách." "Lỗi không xác định." - "Đã nhận qua bluetooth" "Chia sẻ qua Bluetooth" "Hoàn tất nhận %1$s." "Hoàn tất gửi %1$s." diff --git a/android/app/res/values-zh-rCN/strings.xml b/android/app/res/values-zh-rCN/strings.xml index e04dede015..14b3070802 100644 --- a/android/app/res/values-zh-rCN/strings.xml +++ b/android/app/res/values-zh-rCN/strings.xml @@ -101,7 +101,6 @@ "连接失败。" "无法正确处理请求。" "未知错误。" - "通过蓝牙接收的文件" "蓝牙共享" "%1$s接收完成。" "%1$s发送完成。" diff --git a/android/app/res/values-zh-rHK/strings.xml b/android/app/res/values-zh-rHK/strings.xml index d3f427c15a..6eae82bb31 100644 --- a/android/app/res/values-zh-rHK/strings.xml +++ b/android/app/res/values-zh-rHK/strings.xml @@ -101,7 +101,6 @@ "連線失敗。" "無法正確處理要求。" "未知錯誤。" - "透過藍牙接收的檔案" "藍牙分享" "已完成 %1$s 的接收作業。" "已完成 %1$s 的傳送作業。" diff --git a/android/app/res/values-zh-rTW/strings.xml b/android/app/res/values-zh-rTW/strings.xml index 0884f6e68e..97ee53f362 100644 --- a/android/app/res/values-zh-rTW/strings.xml +++ b/android/app/res/values-zh-rTW/strings.xml @@ -101,7 +101,6 @@ "連線失敗。" "無法正確處理要求。" "未知的錯誤。" - "透過藍牙接收的檔案" "藍牙分享" "已完成 %1$s 的接收作業。" "已完成 %1$s 的傳送作業。" diff --git a/android/app/res/values-zu/strings.xml b/android/app/res/values-zu/strings.xml index d36cbaf1d1..66b31ae95e 100644 --- a/android/app/res/values-zu/strings.xml +++ b/android/app/res/values-zu/strings.xml @@ -101,7 +101,6 @@ "Ukuxhumeka akuphumelelanga." "Isicelo asikwazi ukuphathwa ngokulungile" "Iphutha elingaziwa" - "I-Bluetooth etholiwe" "Ukwabelana kwe-bluetooth" "%1$s Ukuthola kuqedile." "%1$s Ukuthumela kuqedile." -- cgit v1.2.3-59-g8ed1b From feb8b14dbd73db5b752610d79d907a53f33f424b Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 18 Jan 2024 18:17:27 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I35a482e9906fbd1a51e3f2f09d9a38e2139341f7 --- android/app/res/values-eu/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/res/values-eu/strings.xml b/android/app/res/values-eu/strings.xml index cadf3ef312..25ff50eb6f 100644 --- a/android/app/res/values-eu/strings.xml +++ b/android/app/res/values-eu/strings.xml @@ -18,9 +18,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Bluetootha" "Atzitu deskargen kudeatzailea." - "Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen die aplikazioei." + "Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen dio aplikazioari." "Ezarri Bluetooth bidezko gailuak onartutakoen zerrendan." - "Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan ezartzeko baimena ematen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe." + "Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan ezartzeko baimena ematen dio aplikazioari, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe." "Bluetootha" "Identifikatu ezin den gailua" "Ezezaguna" -- cgit v1.2.3-59-g8ed1b From 1f63edb44175107b8775b3daaf05f22b9136fbf5 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 18 Jan 2024 18:17:50 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I7b1c9a208bfd43cda7697bba743b03a84cc7897e --- android/app/res/values-eu/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/res/values-eu/strings.xml b/android/app/res/values-eu/strings.xml index 5dd5f841a0..c29cff6ec0 100644 --- a/android/app/res/values-eu/strings.xml +++ b/android/app/res/values-eu/strings.xml @@ -17,9 +17,9 @@ "Atzitu deskargen kudeatzailea." - "Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen die aplikazioei." + "Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen dio aplikazioari." "Ezarri Bluetooth bidezko gailuak onartutakoen zerrendan." - "Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan ezartzeko baimena ematen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe." + "Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan ezartzeko baimena ematen dio aplikazioari, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe." "Bluetootha" "Identifikatu ezin den gailua" "Ezezaguna" -- cgit v1.2.3-59-g8ed1b From a42fa1bda6faa9ceb676a0ac3bd0d021dc314bf5 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 18 Jan 2024 18:18:14 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I1697868a5d886c8ee81cd80587e618c4d9f89e05 --- android/app/res/values-eu/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/res/values-eu/strings.xml b/android/app/res/values-eu/strings.xml index 64e721afa7..cfbd84189f 100644 --- a/android/app/res/values-eu/strings.xml +++ b/android/app/res/values-eu/strings.xml @@ -18,9 +18,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Bluetootha" "Atzitu deskargen kudeatzailea." - "Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen die aplikazioei." + "Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen dio aplikazioari." "Ezarri Bluetooth bidezko gailuak onartutakoen zerrendan." - "Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan ezartzeko baimena ematen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe." + "Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan ezartzeko baimena ematen dio aplikazioari, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe." "Bluetootha" "Identifikatu ezin den gailua" "Ezezaguna" -- cgit v1.2.3-59-g8ed1b From 76f93fa0ced1fea4ad566ec7a3aa31ff252a1e4b Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Fri, 19 Jan 2024 11:48:03 -0800 Subject: Add fix_le_oob_pairing_bypass flag Bug: 321271585 Bug: 315241296 Test: m . Ignore-AOSP-First: security Change-Id: I1007f540278b72e9558b9e6b2371645c61c63db2 --- flags/security.aconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/flags/security.aconfig b/flags/security.aconfig index 85bedde180..c5092d58ab 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -14,3 +14,10 @@ flag { description: "Correct the pairing failure reason reported from remote" bug: "320745565" } + +flag { + name: "fix_le_oob_pairing_bypass" + namespace: "bluetooth" + description: "Fix oob bypassing bug in SMP" + bug: "321271585" +} -- cgit v1.2.3-59-g8ed1b From bac3e50fbab5290423d909e4501f7f5bc2dfd13d Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Fri, 19 Jan 2024 11:58:31 -0800 Subject: Fix an authentication bypass bug in SMP When an OOB pairing with secure connections initiated from remote, authentication can be bypassed. This change fixes it. Bug: 251514171 Bug: 321271585 Test: m com.android.btservices Test: manual run against PoC Ignore-AOSP-First: security Change-Id: I5b79d58cb8915415a96a9ef7deafa2f1fc4d7056 --- system/stack/smp/smp_act.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc index ce21d218cb..59e5c66ac1 100644 --- a/system/stack/smp/smp_act.cc +++ b/system/stack/smp/smp_act.cc @@ -1956,6 +1956,14 @@ void smp_process_secure_connection_oob_data(tSMP_CB* p_cb, if (!p_sc_oob_data->peer_oob_data.present) { LOG_VERBOSE("peer OOB data is absent"); + + if (IS_FLAG_ENABLED(fix_le_oob_pairing_bypass)) { + tSMP_INT_DATA smp_int_data{}; + smp_int_data.status = SMP_OOB_FAIL; + smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data); + return; + } + p_cb->peer_random = {0}; } else { p_cb->peer_random = p_sc_oob_data->peer_oob_data.randomizer; -- cgit v1.2.3-59-g8ed1b From f24f3183c4afc949383b5b8a292d3b0cc7c973b7 Mon Sep 17 00:00:00 2001 From: Brian Delwiche Date: Thu, 11 Jan 2024 02:55:03 +0000 Subject: Add flag for BLUFFS mitigation Test: m libbluetooth Bug: 319541706 Bug: 315241296 Tag: #security Ignore-AOSP-First: Security Change-Id: Id3083812e831c84d9a9bb1224ac99475a02ff322 --- flags/security.aconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flags/security.aconfig b/flags/security.aconfig index c5092d58ab..c33d99a93f 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -7,6 +7,12 @@ flag { bug: "319530790" } +flag { + name: "bluffs_mitigation" + namespace: "bluetooth" + description: "Cache security values to mitigate BLUFFS" + bug: "314331379" +} flag { name: "fix_pairing_failure_reason_from_remote" -- cgit v1.2.3-59-g8ed1b From 0357d53445cf90913d8cec868d17edb9589c417c Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Wed, 24 Jan 2024 02:06:10 -0800 Subject: Add fix_le_pairing_passkey_entry_bypass flag Bug: 321300737 Bug: 315241296 Test: m . Ignore-AOSP-First: security Change-Id: I75f4a037c9a32c7db496363eeed66663844b7576 --- flags/security.aconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/flags/security.aconfig b/flags/security.aconfig index c33d99a93f..a56bae9639 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -27,3 +27,10 @@ flag { description: "Fix oob bypassing bug in SMP" bug: "321271585" } + +flag { + name: "fix_le_pairing_passkey_entry_bypass" + namespace: "bluetooth" + description: "Fix the passkey entry bypassing bug in SMP" + bug: "321300737" +} -- cgit v1.2.3-59-g8ed1b From eaa367379e0f08d5ab3167ac49136343e0c87e52 Mon Sep 17 00:00:00 2001 From: Hui Peng Date: Wed, 24 Jan 2024 02:07:32 -0800 Subject: Fix an authentication bypass bug in SMP When pairing with BLE legacy pairing initiated from remote, authentication can be bypassed. This change fixes it. Bug: 251514170 Bug: 321300737 Test: m com.android.btservices Test: manual run against PoC Ignore-AOSP-First: security Change-Id: Id36c06beb13bcbc9b499ef59f6d4e43ac616da10 --- system/stack/smp/smp_act.cc | 14 ++++++++++++++ system/stack/smp/smp_int.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc index 2222c036cd..93360e76f9 100644 --- a/system/stack/smp/smp_act.cc +++ b/system/stack/smp/smp_act.cc @@ -318,6 +318,7 @@ void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { LOG_VERBOSE("addr:%s", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); smp_send_cmd(SMP_OPCODE_CONFIRM, p_cb); + p_cb->flags |= SMP_PAIR_FLAGS_CMD_CONFIRM_SENT; } /******************************************************************************* @@ -683,6 +684,19 @@ void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { return; } + if (IS_FLAG_ENABLED(fix_le_pairing_passkey_entry_bypass)) { + if (!((p_cb->loc_auth_req & SMP_SC_SUPPORT_BIT) && + (p_cb->peer_auth_req & SMP_SC_SUPPORT_BIT)) && + !(p_cb->flags & SMP_PAIR_FLAGS_CMD_CONFIRM_SENT)) { + // in legacy pairing, the peer should send its rand after + // we send our confirm + tSMP_INT_DATA smp_int_data{}; + smp_int_data.status = SMP_INVALID_PARAMETERS; + smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data); + return; + } + } + /* save the SRand for comparison */ STREAM_TO_ARRAY(p_cb->rrand.data(), p, OCTET16_LEN); } diff --git a/system/stack/smp/smp_int.h b/system/stack/smp/smp_int.h index bfb017ccd3..a7b98e92d3 100644 --- a/system/stack/smp/smp_int.h +++ b/system/stack/smp/smp_int.h @@ -264,6 +264,8 @@ typedef union { #define SMP_PAIR_FLAG_HAVE_LOCAL_PUBL_KEY \ (1 << 8) /* used on peripheral to resolve race condition */ +#define SMP_PAIR_FLAGS_CMD_CONFIRM_SENT (1 << 9) + /* check if authentication requirement need MITM protection */ #define SMP_NO_MITM_REQUIRED(x) (((x)&SMP_AUTH_YN_BIT) == 0) -- cgit v1.2.3-59-g8ed1b From 8c86c62beb657ddf6433c2d22478c050d6565fbb Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Fri, 26 Jan 2024 15:54:47 +0900 Subject: Modify ContentProfileFileName enum According to protobuf best practices, some enum names are changed. Bug: 312269095 Bug: 294797589 Bug: 317002318 Test: m -j; Ignore-AOSP-First: The enum is defined in internal, so need to fix internal first. Then these CLs will be cherrypicked into AOSP. Change-Id: If488b9f5ae1f027a0a0879477c611f2161dd21ae --- android/app/src/com/android/bluetooth/map/MmsFileProvider.java | 10 +++++----- android/app/src/com/android/bluetooth/map/SmsMmsContacts.java | 4 ++-- .../app/src/com/android/bluetooth/pbap/PbapStateMachine.java | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/android/app/src/com/android/bluetooth/map/MmsFileProvider.java b/android/app/src/com/android/bluetooth/map/MmsFileProvider.java index 29c5ecfe71..00420f9528 100644 --- a/android/app/src/com/android/bluetooth/map/MmsFileProvider.java +++ b/android/app/src/com/android/bluetooth/map/MmsFileProvider.java @@ -96,7 +96,7 @@ public class MmsFileProvider extends ContentProvider { } catch (NumberFormatException e) { ContentProfileErrorReportUtils.report( BluetoothProfile.MAP, - BluetoothProtoEnums.MMS_FILE_PROVIDER, + BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 0); Log.w(TAG, e); @@ -135,7 +135,7 @@ public class MmsFileProvider extends ContentProvider { } catch (IOException e) { ContentProfileErrorReportUtils.report( BluetoothProfile.MAP, - BluetoothProtoEnums.MMS_FILE_PROVIDER, + BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 1); Log.w(TAG, e); @@ -145,7 +145,7 @@ public class MmsFileProvider extends ContentProvider { } catch (MmsException e) { ContentProfileErrorReportUtils.report( BluetoothProfile.MAP, - BluetoothProtoEnums.MMS_FILE_PROVIDER, + BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 2); Log.w(TAG, e); @@ -161,7 +161,7 @@ public class MmsFileProvider extends ContentProvider { } catch (IOException e) { ContentProfileErrorReportUtils.report( BluetoothProfile.MAP, - BluetoothProtoEnums.MMS_FILE_PROVIDER, + BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER, BluetoothStatsLog .BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 3); @@ -172,7 +172,7 @@ public class MmsFileProvider extends ContentProvider { } catch (IOException e) { ContentProfileErrorReportUtils.report( BluetoothProfile.MAP, - BluetoothProtoEnums.MMS_FILE_PROVIDER, + BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER, BluetoothStatsLog .BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 4); diff --git a/android/app/src/com/android/bluetooth/map/SmsMmsContacts.java b/android/app/src/com/android/bluetooth/map/SmsMmsContacts.java index fc9924a5b9..f45e0ad3f8 100644 --- a/android/app/src/com/android/bluetooth/map/SmsMmsContacts.java +++ b/android/app/src/com/android/bluetooth/map/SmsMmsContacts.java @@ -98,7 +98,7 @@ public class SmsMmsContacts { Log.e(TAG, "query failed"); ContentProfileErrorReportUtils.report( BluetoothProfile.MAP, - BluetoothProtoEnums.SMS_MMS_CONTACTS, + BluetoothProtoEnums.BLUETOOTH_SMS_MMS_CONTACTS, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__LOG_ERROR, 0); } finally { @@ -153,7 +153,7 @@ public class SmsMmsContacts { Log.e(TAG, "query failed"); ContentProfileErrorReportUtils.report( BluetoothProfile.MAP, - BluetoothProtoEnums.SMS_MMS_CONTACTS, + BluetoothProtoEnums.BLUETOOTH_SMS_MMS_CONTACTS, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__LOG_ERROR, 1); } diff --git a/android/app/src/com/android/bluetooth/pbap/PbapStateMachine.java b/android/app/src/com/android/bluetooth/pbap/PbapStateMachine.java index 4023247be2..c18f6a8444 100644 --- a/android/app/src/com/android/bluetooth/pbap/PbapStateMachine.java +++ b/android/app/src/com/android/bluetooth/pbap/PbapStateMachine.java @@ -271,7 +271,7 @@ public class PbapStateMachine extends StateMachine { } catch (IOException ex) { ContentProfileErrorReportUtils.report( BluetoothProfile.PBAP, - BluetoothProtoEnums.PBAP_STATE_MACHINE, + BluetoothProtoEnums.BLUETOOTH_PBAP_STATE_MACHINE, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 0); Log.e(TAG, "Caught exception starting OBEX reject server session" + ex.toString()); @@ -301,7 +301,7 @@ public class PbapStateMachine extends StateMachine { } catch (IOException e) { ContentProfileErrorReportUtils.report( BluetoothProfile.PBAP, - BluetoothProtoEnums.PBAP_STATE_MACHINE, + BluetoothProtoEnums.BLUETOOTH_PBAP_STATE_MACHINE, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 1); Log.e(TAG, "Close Connection Socket error: " + e.toString()); @@ -326,7 +326,7 @@ public class PbapStateMachine extends StateMachine { } catch (IOException ex) { ContentProfileErrorReportUtils.report( BluetoothProfile.PBAP, - BluetoothProtoEnums.PBAP_STATE_MACHINE, + BluetoothProtoEnums.BLUETOOTH_PBAP_STATE_MACHINE, BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION, 2); Log.e(TAG, "Caught exception starting OBEX server session" + ex.toString()); -- cgit v1.2.3-59-g8ed1b From e9365f888de6c25eb51fb02ff9be85a69f189b68 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 30 Jan 2024 13:17:10 -0800 Subject: Remove libosi from fuzz targets It's not used, and it conflicts because the dependency was added to the incorrect target when it was cherry-picked. Compare this change ID on internal and AOSP: Ib04f96702b53930bdd7d18c40b79d1ee5e0aa7b6 Bug: 301661850 Test: mma -j32 Ignore-AOSP-First: Resolving a merge conflict Change-Id: I307c416f714fed9ad287b039f6501ff876e0875a --- system/stack/Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/system/stack/Android.bp b/system/stack/Android.bp index f8a56d2205..c47e96c557 100644 --- a/system/stack/Android.bp +++ b/system/stack/Android.bp @@ -630,7 +630,6 @@ cc_fuzz { "libbt_shim_bridge", "libbt_shim_ffi", "libgmock", - "libosi", ], target: { android: { -- cgit v1.2.3-59-g8ed1b From ec6e086f7aff3a69084fd295d9212405c419f4f1 Mon Sep 17 00:00:00 2001 From: Brian Delwiche Date: Fri, 5 Jan 2024 23:50:02 +0000 Subject: Add support for checking security downgrade As a guard against the BLUFFS attack, we will need to check the security parameters of incoming connections against cached values and disallow connection if these parameters are downgraded or changed from their cached values. Future CLs will add checks during connection. This CL adds the functions that will be needed to perform those checks and the necessary mocks. Currently supported checks are : IO capabilities (must be an exact match), Secure Connections capability (must not be a downgrade), and session key length (must not be a downgrade). Maximum session key length, which was previously not cached, has been added to the device security manager cache. To QA: This CL is a logical no-op by itself. Tests should be performed as described in ag/25815924 and ag/25815925/ Bug: 314331379 Test: m libbluetooth Tag: #security Ignore-AOSP-First: Security Change-Id: I3cd1db300be68d15cb09bdabea711199fcf748da --- system/btif/src/btif_storage.cc | 28 ++++++++ system/gd/discovery/device/bt_property.cc | 14 ++++ system/gd/storage/config_keys.h | 2 + system/include/hardware/bluetooth.h | 14 ++++ system/stack/btm/btm_sec.cc | 104 ++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+) diff --git a/system/btif/src/btif_storage.cc b/system/btif/src/btif_storage.cc index 7069431919..24d2bd946f 100644 --- a/system/btif/src/btif_storage.cc +++ b/system/btif/src/btif_storage.cc @@ -212,6 +212,14 @@ static bool prop2cfg(const RawAddress* remote_bd_addr, bt_property_t* prop) { value[prop->len] = '\0'; btif_config_set_str(bdstr, BTIF_STORAGE_KEY_DIS_MODEL_NUM, value); } break; + case BT_PROPERTY_REMOTE_SECURE_CONNECTIONS_SUPPORTED: + btif_config_set_int(bdstr, BTIF_STORAGE_KEY_SECURE_CONNECTIONS_SUPPORTED, + *(uint8_t*)prop->val); + break; + case BT_PROPERTY_REMOTE_MAX_SESSION_KEY_SIZE: + btif_config_set_int(bdstr, BTIF_STORAGE_KEY_MAX_SESSION_KEY_SIZE, + *(uint8_t*)prop->val); + break; default: LOG_ERROR("Unknown prop type:%d", prop->type); return false; @@ -381,6 +389,26 @@ static bool cfg2prop(const RawAddress* remote_bd_addr, bt_property_t* prop) { } } break; + case BT_PROPERTY_REMOTE_SECURE_CONNECTIONS_SUPPORTED: { + int val; + + if (prop->len >= (int)sizeof(uint8_t)) { + ret = btif_config_get_int( + bdstr, BTIF_STORAGE_KEY_SECURE_CONNECTIONS_SUPPORTED, &val); + *(uint8_t*)prop->val = (uint8_t)val; + } + } break; + + case BT_PROPERTY_REMOTE_MAX_SESSION_KEY_SIZE: { + int val; + + if (prop->len >= (int)sizeof(uint8_t)) { + ret = btif_config_get_int(bdstr, BTIF_STORAGE_KEY_MAX_SESSION_KEY_SIZE, + &val); + *(uint8_t*)prop->val = (uint8_t)val; + } + } break; + default: LOG_ERROR("Unknown prop type:%d", prop->type); return false; diff --git a/system/gd/discovery/device/bt_property.cc b/system/gd/discovery/device/bt_property.cc index a340199da8..223000fb15 100644 --- a/system/gd/discovery/device/bt_property.cc +++ b/system/gd/discovery/device/bt_property.cc @@ -52,6 +52,8 @@ std::string bt_property_type_text(const bt_property_type_t& type) { CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_MODEL_NUM); CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_ADDR_TYPE); CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP); + CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_SECURE_CONNECTIONS_SUPPORTED); + CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_MAX_SESSION_KEY_SIZE); } return base::StringPrintf("Unknown [%d]", (int)type); } @@ -242,6 +244,18 @@ std::string bt_property_text(const bt_property_t& property) { case BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP: return base::StringPrintf("type:%s", bt_property_type_text(property.type).c_str()); + + case BT_PROPERTY_REMOTE_SECURE_CONNECTIONS_SUPPORTED: + return base::StringPrintf( + "type:%s remote secure connections supported:%hhd", + bt_property_type_text(property.type).c_str(), + (*(uint8_t*)property.val)); + + case BT_PROPERTY_REMOTE_MAX_SESSION_KEY_SIZE: + return base::StringPrintf( + "type:%s remote max session key size:%hhd", + bt_property_type_text(property.type).c_str(), + (*(uint8_t*)property.val)); } return std::string("Unknown"); } diff --git a/system/gd/storage/config_keys.h b/system/gd/storage/config_keys.h index 64492aed6d..d5e19d8794 100644 --- a/system/gd/storage/config_keys.h +++ b/system/gd/storage/config_keys.h @@ -91,6 +91,7 @@ #define BTIF_STORAGE_KEY_LINK_KEY "LinkKey" #define BTIF_STORAGE_KEY_LINK_KEY_TYPE "LinkKeyType" #define BTIF_STORAGE_KEY_LOCAL_IO_CAPS "LocalIOCaps" +#define BTIF_STORAGE_KEY_MAX_SESSION_KEY_SIZE "MaxSessionKeySize" #define BTIF_STORAGE_KEY_METRICS_ID_KEY "MetricsId" #define BTIF_STORAGE_KEY_METRICS_SALT_256BIT "Salt256Bit" #define BTIF_STORAGE_KEY_NAME "Name" @@ -107,6 +108,7 @@ #define BTIF_STORAGE_KEY_SDP_DI_MANUFACTURER "SdpDiManufacturer" #define BTIF_STORAGE_KEY_SDP_DI_MODEL "SdpDiModel" #define BTIF_STORAGE_KEY_SDP_DI_VENDOR_ID_SRC "SdpDiVendorIdSource" +#define BTIF_STORAGE_KEY_SECURE_CONNECTIONS_SUPPORTED "SecureConnectionsSupported" #define BTIF_STORAGE_KEY_TIMESTAMP "Timestamp" #define BTIF_STORAGE_KEY_VENDOR_ID "VendorId" #define BTIF_STORAGE_KEY_VENDOR_ID_SOURCE "VendorIdSource" diff --git a/system/include/hardware/bluetooth.h b/system/include/hardware/bluetooth.h index a0679a11be..ef7ff3f746 100644 --- a/system/include/hardware/bluetooth.h +++ b/system/include/hardware/bluetooth.h @@ -403,6 +403,20 @@ typedef enum { */ BT_PROPERTY_REMOTE_ADDR_TYPE, + /** + * Description - Whether remote device supports Secure Connections mode + * Access mode - GET and SET. + * Data Type - uint8_t. + */ + BT_PROPERTY_REMOTE_SECURE_CONNECTIONS_SUPPORTED, + + /** + * Description - Maximum observed session key for remote device + * Access mode - GET and SET. + * Data Type - uint8_t. + */ + BT_PROPERTY_REMOTE_MAX_SESSION_KEY_SIZE, + BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP = 0xFF, } bt_property_type_t; diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index ee2b2772a3..ca43637a96 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -250,6 +250,110 @@ static tBTM_SEC_DEV_REC* btm_sec_find_dev_by_sec_state(uint8_t state) { return nullptr; } +/******************************************************************************* + * + * Function btm_sec_is_device_sc_downgrade + * + * Description Check for a stored device record matching the candidate + * device, and return true if the stored device has reported + * that it supports Secure Connections mode and the candidate + * device reports that it does not. Otherwise, return false. + * + * Returns bool + * + ******************************************************************************/ +static bool btm_sec_is_device_sc_downgrade(uint16_t hci_handle, + bool secure_connections_supported) { + if (secure_connections_supported) return false; + + tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(hci_handle); + if (p_dev_rec == nullptr) return false; + + uint8_t property_val = 0; + bt_property_t property = { + .type = BT_PROPERTY_REMOTE_SECURE_CONNECTIONS_SUPPORTED, + .len = sizeof(uint8_t), + .val = &property_val}; + + bt_status_t cached = + btif_storage_get_remote_device_property(&p_dev_rec->bd_addr, &property); + + if (cached == BT_STATUS_FAIL) return false; + + return (bool)property_val; +} + +/******************************************************************************* + * + * Function btm_sec_store_device_sc_support + * + * Description Save Secure Connections support for this device to file + * + ******************************************************************************/ + +static void btm_sec_store_device_sc_support(uint16_t hci_handle, + bool secure_connections_supported) { + tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(hci_handle); + if (p_dev_rec == nullptr) return; + + uint8_t property_val = (uint8_t)secure_connections_supported; + bt_property_t property = { + .type = BT_PROPERTY_REMOTE_SECURE_CONNECTIONS_SUPPORTED, + .len = sizeof(uint8_t), + .val = &property_val}; + + btif_storage_set_remote_device_property(&p_dev_rec->bd_addr, &property); +} + +/******************************************************************************* + * + * Function btm_sec_is_session_key_size_downgrade + * + * Description Check if there is a stored device record matching this + * handle, and return true if the stored record has a lower + * session key size than the candidate device. + * + * Returns bool + * + ******************************************************************************/ +static bool btm_sec_is_session_key_size_downgrade(uint16_t hci_handle, + uint8_t key_size) { + tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(hci_handle); + if (p_dev_rec == nullptr) return false; + + uint8_t property_val = 0; + bt_property_t property = {.type = BT_PROPERTY_REMOTE_MAX_SESSION_KEY_SIZE, + .len = sizeof(uint8_t), + .val = &property_val}; + + bt_status_t cached = + btif_storage_get_remote_device_property(&p_dev_rec->bd_addr, &property); + + if (cached == BT_STATUS_FAIL) return false; + + return property_val > key_size; +} + +/******************************************************************************* + * + * Function btm_sec_update_session_key_size + * + * Description Store the max session key size to disk, if possible. + * + ******************************************************************************/ +static void btm_sec_update_session_key_size(uint16_t hci_handle, + uint8_t key_size) { + tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(hci_handle); + if (p_dev_rec == nullptr) return; + + uint8_t property_val = key_size; + bt_property_t property = {.type = BT_PROPERTY_REMOTE_MAX_SESSION_KEY_SIZE, + .len = sizeof(uint8_t), + .val = &property_val}; + + btif_storage_set_remote_device_property(&p_dev_rec->bd_addr, &property); +} + /******************************************************************************* * * Function access_secure_service_from_temp_bond -- cgit v1.2.3-59-g8ed1b From a7b20aa0461c7821e71da59994c488e981286c4f Mon Sep 17 00:00:00 2001 From: Brian Delwiche Date: Fri, 5 Jan 2024 23:53:12 +0000 Subject: Disallow connect with Secure Connections downgrade As a guard against the BLUFFS attack, check security parameters of incoming connections against cached values and disallow connection if these parameters are downgraded or changed from their cached values. This CL adds the connection-time check for Secure Connections mode. Bug: 314331379 Test: m libbluetooth Test: manual To test this CL, please ensure that BR/EDR initial connections and reconnections (after cycling remote devices, cycling Bluetooth, restarting the phone, etc.) work against remote devices which both support and do not support Secure Connections mode, and with all supported bonding types. Basic validation of LE bonding functionality should be done as well. Tag: #security Ignore-AOSP-First: Security Change-Id: I874a606a8e61006651dfb0932365b1aea248c100 --- system/stack/btm/btm_sec.cc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index ca43637a96..a1701fd6b9 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -26,6 +26,7 @@ #include "stack/btm/btm_sec.h" +#include #include #include @@ -4118,6 +4119,14 @@ void btm_sec_link_key_notification(const RawAddress& p_bda, } } + if (IS_FLAG_ENABLED(bluffs_mitigation) && + p_dev_rec->sec_rec.is_bond_type_persistent() && + (p_dev_rec->is_device_type_br_edr() || + p_dev_rec->is_device_type_dual_mode())) { + btm_sec_store_device_sc_support(p_dev_rec->get_br_edr_hci_handle(), + p_dev_rec->SupportsSecureConnections()); + } + /* If name is not known at this point delay calling callback until the name is */ /* resolved. Unless it is a HID Device and we really need to send all link @@ -5139,6 +5148,18 @@ void btm_sec_set_peer_sec_caps(uint16_t hci_handle, bool ssp_supported, tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(hci_handle); if (p_dev_rec == nullptr) return; + if (IS_FLAG_ENABLED(bluffs_mitigation)) { + // Drop the connection here if the remote attempts to downgrade from Secure + // Connections mode. + if (btm_sec_is_device_sc_downgrade(hci_handle, sc_supported)) { + acl_set_disconnect_reason(HCI_ERR_HOST_REJECT_SECURITY); + btm_sec_send_hci_disconnect( + p_dev_rec, HCI_ERR_AUTH_FAILURE, hci_handle, + "attempted to downgrade from Secure Connections mode"); + return; + } + } + p_dev_rec->remote_feature_received = true; p_dev_rec->remote_supports_hci_role_switch = hci_role_switch_supported; -- cgit v1.2.3-59-g8ed1b From 27a98dc04a5d17a9ba1fb4a857159f96fd7ddf57 Mon Sep 17 00:00:00 2001 From: Brian Delwiche Date: Fri, 5 Jan 2024 23:56:29 +0000 Subject: Disallow connect with key length downgrade As a guard against the BLUFFS attack, check security parameters of incoming connections against cached values and disallow connection if these parameters are downgraded or changed from their cached values. This CL adds the connection-time check for session key length. Bug: 314331379 Test: m libbluetooth Test: manual To test, please validate that bonding can be established and reestablished against devices with session key lengths of 7 and 16 bits, that session key lengths of less than 7 bits are refused, and that basic LE bonding functionality still works. If it is possible to configure a remote device to establish a bond with a session key length of 16 bits and then reduce that key length to <16 bits before reconnection, this should fail. Tag: #security Ignore-AOSP-First: Security Change-Id: I0f3c1b46e103e4bf7d9cd3240168faaaa271cebc --- system/stack/btm/btm_sec.cc | 74 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 17 deletions(-) diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index a1701fd6b9..2c656a602d 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -3483,6 +3483,22 @@ static void read_encryption_key_size_complete_after_encryption_change( return; } + if (IS_FLAG_ENABLED(bluffs_mitigation)) { + if (btm_sec_is_session_key_size_downgrade(handle, key_size)) { + LOG_ERROR( + "encryption key size lower than cached value, disconnecting. " + "handle: 0x%x attempted key size: %d", + handle, key_size); + acl_disconnect_from_handle( + handle, HCI_ERR_HOST_REJECT_SECURITY, + "stack::btu::btu_hcif::read_encryption_key_size_complete_after_" + "encryption_change Key Size Downgrade"); + return; + } + + btm_sec_update_session_key_size(handle, key_size); + } + // good key size - succeed btm_acl_encrypt_change(handle, static_cast(status), 1 /* enable */); @@ -3504,25 +3520,49 @@ void smp_cancel_start_encryption_attempt(); ******************************************************************************/ void btm_sec_encryption_change_evt(uint16_t handle, tHCI_STATUS status, uint8_t encr_enable) { - if (status != HCI_SUCCESS || encr_enable == 0 || - BTM_IsBleConnection(handle) || - !controller_get_interface()->supports_read_encryption_key_size() || - // Skip encryption key size check when using set_min_encryption_key_size - (bluetooth::common::init_flags::set_min_encryption_is_enabled() && - controller_get_interface()->supports_set_min_encryption_key_size())) { - if (status == HCI_ERR_CONNECTION_TOUT) { - smp_cancel_start_encryption_attempt(); - return; - } + if (IS_FLAG_ENABLED(bluffs_mitigation)) { + if (status != HCI_SUCCESS || encr_enable == 0 || + BTM_IsBleConnection(handle) || + !controller_get_interface()->supports_read_encryption_key_size()) { + if (status == HCI_ERR_CONNECTION_TOUT) { + smp_cancel_start_encryption_attempt(); + return; + } - btm_acl_encrypt_change(handle, static_cast(status), - encr_enable); - btm_sec_encrypt_change(handle, static_cast(status), - encr_enable); + btm_acl_encrypt_change(handle, static_cast(status), + encr_enable); + btm_sec_encrypt_change(handle, static_cast(status), + encr_enable); + } else { + btsnd_hcic_read_encryption_key_size( + handle, + base::Bind( + &read_encryption_key_size_complete_after_encryption_change)); + } } else { - btsnd_hcic_read_encryption_key_size( - handle, - base::Bind(&read_encryption_key_size_complete_after_encryption_change)); + // This block added to ensure matching code flow with the bluffs_mitigation + // flag off. The entire block should be removed when the flag is. + if (status != HCI_SUCCESS || encr_enable == 0 || + BTM_IsBleConnection(handle) || + !controller_get_interface()->supports_read_encryption_key_size() || + // Skip encryption key size check when using set_min_encryption_key_size + (bluetooth::common::init_flags::set_min_encryption_is_enabled() && + controller_get_interface()->supports_set_min_encryption_key_size())) { + if (status == HCI_ERR_CONNECTION_TOUT) { + smp_cancel_start_encryption_attempt(); + return; + } + + btm_acl_encrypt_change(handle, static_cast(status), + encr_enable); + btm_sec_encrypt_change(handle, static_cast(status), + encr_enable); + } else { + btsnd_hcic_read_encryption_key_size( + handle, + base::Bind( + &read_encryption_key_size_complete_after_encryption_change)); + } } } /******************************************************************************* -- cgit v1.2.3-59-g8ed1b From 72f8d2dd79d5abbeaa208a18feefdd9c7353fcb3 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Mon, 11 Dec 2023 08:55:22 -0800 Subject: Use GD Controller for SupportsBle in btm_sec Bug: 321273521 Test: mma -j32 Flag: EXEMPT, no logical change Ignore-AOSP-First: conflicts with security fix Change-Id: I978970762691f078a5f7b754fb95b526854cb04d --- system/stack/btm/btm_sec.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index 2c656a602d..fc46688d58 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -3523,7 +3523,8 @@ void btm_sec_encryption_change_evt(uint16_t handle, tHCI_STATUS status, if (IS_FLAG_ENABLED(bluffs_mitigation)) { if (status != HCI_SUCCESS || encr_enable == 0 || BTM_IsBleConnection(handle) || - !controller_get_interface()->supports_read_encryption_key_size()) { + !bluetooth::shim::GetController()->IsSupported( + bluetooth::hci::OpCode::READ_ENCRYPTION_KEY_SIZE)) { if (status == HCI_ERR_CONNECTION_TOUT) { smp_cancel_start_encryption_attempt(); return; @@ -3544,10 +3545,12 @@ void btm_sec_encryption_change_evt(uint16_t handle, tHCI_STATUS status, // flag off. The entire block should be removed when the flag is. if (status != HCI_SUCCESS || encr_enable == 0 || BTM_IsBleConnection(handle) || - !controller_get_interface()->supports_read_encryption_key_size() || + !bluetooth::shim::GetController()->IsSupported( + bluetooth::hci::OpCode::READ_ENCRYPTION_KEY_SIZE) || // Skip encryption key size check when using set_min_encryption_key_size (bluetooth::common::init_flags::set_min_encryption_is_enabled() && - controller_get_interface()->supports_set_min_encryption_key_size())) { + bluetooth::shim::GetController()->IsSupported( + bluetooth::hci::OpCode::SET_MIN_ENCRYPTION_KEY_SIZE))) { if (status == HCI_ERR_CONNECTION_TOUT) { smp_cancel_start_encryption_attempt(); return; @@ -4084,7 +4087,8 @@ void btm_sec_encryption_key_refresh_complete(uint16_t handle, tHCI_STATUS status) { if (status != HCI_SUCCESS || BTM_IsBleConnection(handle) || // Skip encryption key size check when using set_min_encryption_key_size - controller_get_interface()->supports_set_min_encryption_key_size()) { + bluetooth::shim::GetController()->IsSupported( + bluetooth::hci::OpCode::SET_MIN_ENCRYPTION_KEY_SIZE)) { btm_sec_encrypt_change(handle, static_cast(status), (status == HCI_SUCCESS) ? 1 : 0); } else { -- cgit v1.2.3-59-g8ed1b From e624ae27f335a85e19a372da9059becc9d32d0e1 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 14 Feb 2024 06:12:17 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I2d7d0d27175515a72c6ac45b0ee429c4f9fa9f0e --- android/app/res/values-af/strings.xml | 8 ++++++++ android/app/res/values-am/strings.xml | 4 ++++ android/app/res/values-ar/strings.xml | 8 ++++++++ android/app/res/values-as/strings.xml | 4 ++++ android/app/res/values-az/strings.xml | 4 ++++ android/app/res/values-b+sr+Latn/strings.xml | 8 ++++++++ android/app/res/values-be/strings.xml | 8 ++++++++ android/app/res/values-bg/strings.xml | 8 ++++++++ android/app/res/values-bn/strings.xml | 8 ++++++++ android/app/res/values-bs/strings.xml | 4 ++++ android/app/res/values-ca/strings.xml | 4 ++++ android/app/res/values-cs/strings.xml | 8 ++++++++ android/app/res/values-da/strings.xml | 8 ++++++++ android/app/res/values-de/strings.xml | 8 ++++++++ android/app/res/values-el/strings.xml | 4 ++++ android/app/res/values-en-rAU/strings.xml | 8 ++++++++ android/app/res/values-en-rCA/strings.xml | 4 ++++ android/app/res/values-en-rGB/strings.xml | 8 ++++++++ android/app/res/values-en-rIN/strings.xml | 8 ++++++++ android/app/res/values-en-rXC/strings.xml | 4 ++++ android/app/res/values-es-rUS/strings.xml | 8 ++++++++ android/app/res/values-es/strings.xml | 4 ++++ android/app/res/values-et/strings.xml | 4 ++++ android/app/res/values-eu/strings.xml | 8 ++++++++ android/app/res/values-fa/strings.xml | 8 ++++++++ android/app/res/values-fi/strings.xml | 8 ++++++++ android/app/res/values-fr-rCA/strings.xml | 8 ++++++++ android/app/res/values-fr/strings.xml | 4 ++++ android/app/res/values-gl/strings.xml | 8 ++++++++ android/app/res/values-gu/strings.xml | 8 ++++++++ android/app/res/values-hi/strings.xml | 8 ++++++++ android/app/res/values-hr/strings.xml | 4 ++++ android/app/res/values-hu/strings.xml | 8 ++++++++ android/app/res/values-hy/strings.xml | 8 ++++++++ android/app/res/values-in/strings.xml | 8 ++++++++ android/app/res/values-is/strings.xml | 8 ++++++++ android/app/res/values-it/strings.xml | 4 ++++ android/app/res/values-iw/strings.xml | 8 ++++++++ android/app/res/values-ja/strings.xml | 4 ++++ android/app/res/values-ka/strings.xml | 4 ++++ android/app/res/values-kk/strings.xml | 8 ++++++++ android/app/res/values-km/strings.xml | 4 ++++ android/app/res/values-kn/strings.xml | 8 ++++++++ android/app/res/values-ko/strings.xml | 8 ++++++++ android/app/res/values-ky/strings.xml | 8 ++++++++ android/app/res/values-lo/strings.xml | 4 ++++ android/app/res/values-lt/strings.xml | 8 ++++++++ android/app/res/values-lv/strings.xml | 8 ++++++++ android/app/res/values-mk/strings.xml | 8 ++++++++ android/app/res/values-ml/strings.xml | 4 ++++ android/app/res/values-mn/strings.xml | 8 ++++++++ android/app/res/values-mr/strings.xml | 4 ++++ android/app/res/values-ms/strings.xml | 4 ++++ android/app/res/values-my/strings.xml | 8 ++++++++ android/app/res/values-nb/strings.xml | 8 ++++++++ android/app/res/values-ne/strings.xml | 4 ++++ android/app/res/values-nl/strings.xml | 4 ++++ android/app/res/values-or/strings.xml | 8 ++++++++ android/app/res/values-pa/strings.xml | 8 ++++++++ android/app/res/values-pl/strings.xml | 8 ++++++++ android/app/res/values-pt-rPT/strings.xml | 4 ++++ android/app/res/values-pt/strings.xml | 8 ++++++++ android/app/res/values-ro/strings.xml | 8 ++++++++ android/app/res/values-ru/strings.xml | 8 ++++++++ android/app/res/values-si/strings.xml | 8 ++++++++ android/app/res/values-sk/strings.xml | 8 ++++++++ android/app/res/values-sl/strings.xml | 4 ++++ android/app/res/values-sq/strings.xml | 8 ++++++++ android/app/res/values-sr/strings.xml | 8 ++++++++ android/app/res/values-sv/strings.xml | 8 ++++++++ android/app/res/values-sw/strings.xml | 4 ++++ android/app/res/values-ta/strings.xml | 8 ++++++++ android/app/res/values-te/strings.xml | 4 ++++ android/app/res/values-th/strings.xml | 4 ++++ android/app/res/values-tl/strings.xml | 4 ++++ android/app/res/values-tr/strings.xml | 8 ++++++++ android/app/res/values-uk/strings.xml | 8 ++++++++ android/app/res/values-ur/strings.xml | 4 ++++ android/app/res/values-uz/strings.xml | 8 ++++++++ android/app/res/values-vi/strings.xml | 8 ++++++++ android/app/res/values-zh-rCN/strings.xml | 8 ++++++++ android/app/res/values-zh-rHK/strings.xml | 8 ++++++++ android/app/res/values-zh-rTW/strings.xml | 8 ++++++++ android/app/res/values-zu/strings.xml | 8 ++++++++ 84 files changed, 556 insertions(+) diff --git a/android/app/res/values-af/strings.xml b/android/app/res/values-af/strings.xml index b6fafebadc..58f7916eb3 100644 --- a/android/app/res/values-af/strings.xml +++ b/android/app/res/values-af/strings.xml @@ -135,4 +135,12 @@ "Jou toestel onthou om Bluetooth aan te hou in vliegtuigmodus. Skakel Bluetooth af as jy nie wil hê dit moet aan bly nie." "Wi-fi en Bluetooth bly aan" "Jou toestel onthou om wi‑fi en Bluetooth aan te hou in vliegtuigmodus. Skakel wi-fi en Bluetooth af as jy nie wil hê dit moet aan bly nie." + + + + + + + + diff --git a/android/app/res/values-am/strings.xml b/android/app/res/values-am/strings.xml index a0307883cc..9dd788ed09 100644 --- a/android/app/res/values-am/strings.xml +++ b/android/app/res/values-am/strings.xml @@ -135,4 +135,8 @@ "መሣሪያዎ ብሉቱዝን በአውሮፕላን ሁነታ ውስጥ አብርቶ ማቆየትን ያስታውሳል። በርቶ እንዲቆይ ካልፈለጉ ብሉቱዝን ያጥፉት።" "Wi-Fi እና ብሉቱዝ በርተው ይቆያሉ" "መሣሪያዎ Wi-Fiን እና ብሉቱዝን በአውሮፕላን ሁነታ ውስጥ አብርቶ ማቆየትን ያስታውሳል። በርተው እንዲቆዩ ካልፈለጉ Wi-Fi እና ብሉቱዝን ያጥፏቸው።" + "ብሉቱዝ በራስ-ሰር ነቅቷል" + "በራስ-ሰር ዳግም ማስጀመር በብሉቱዝ ቅንብሮች ውስጥ ሊቀያየር ይችላል።" + "አጥፋ" + "ብሉቱዝ የራስ-ሰር ሁኔታ ለውጥ" diff --git a/android/app/res/values-ar/strings.xml b/android/app/res/values-ar/strings.xml index 32103139b7..1e35fedbf4 100644 --- a/android/app/res/values-ar/strings.xml +++ b/android/app/res/values-ar/strings.xml @@ -135,4 +135,12 @@ "يتذكر جهازك الاحتفاظ بتقنية البلوتوث مفعَّلة في \"وضع الطيران\". يمكنك إيقاف تقنية البلوتوث إذا لم تكن تريد مواصلة تفعيلها." "‏تظل شبكة Wi‑Fi وتقنية البلوتوث مفعَّلتَين." "‏يتذكر جهازك الاحتفاظ بشبكة Wi‑Fi وتقنية البلوتوث مفعَّلتَين في \"وضع الطيران\". يمكنك إيقاف شبكة Wi‑Fi وتقنية البلوتوث إذا لم تكن تريد مواصلة تفعيلهما." + + + + + + + + diff --git a/android/app/res/values-as/strings.xml b/android/app/res/values-as/strings.xml index 077255117b..7256f24fe6 100644 --- a/android/app/res/values-as/strings.xml +++ b/android/app/res/values-as/strings.xml @@ -135,4 +135,8 @@ "আপোনাৰ ডিভাইচটোৱে এয়াৰপ্লেন ম’ডত ব্লুটুথ অন ৰাখিবলৈ মনত ৰাখে। আপুনি যদি ব্লুটুথ অন হৈ থকাটো নিবিচাৰে, তেন্তে ইয়াক অফ কৰক।" "ৱাই-ফাই আৰু ব্লুটুথ অন হৈ থাকে" "আপোনাৰ ডিভাইচটোৱে এয়াৰপ্লেন ম’ডত ৱাই-ফাই আৰু ব্লুটুথ অন ৰাখিবলৈ মনত ৰাখে। আপুনি ৱাই-ফাই আৰু ব্লুটুথ অন হৈ থকাটো নিবিচাৰিলে সেইবোৰ অফ কৰক।" + "ব্লুটুথ স্বয়ংক্ৰিয়ভাৱে সক্ষম কৰা হৈছে" + "ব্লুটুথৰ ছেটিঙত স্বয়ংক্ৰিয় ৰিষ্টাৰ্ট ট’গল কৰা হ’ব পাৰে।" + "অফ কৰক" + "ব্লুটুথৰ স্বয়ংক্ৰিয় স্থিতি সলনি হোৱা" diff --git a/android/app/res/values-az/strings.xml b/android/app/res/values-az/strings.xml index 3a005fc3de..147bb2365f 100644 --- a/android/app/res/values-az/strings.xml +++ b/android/app/res/values-az/strings.xml @@ -135,4 +135,8 @@ "Cihaz təyyarə rejimində Bluetooth-u aktiv saxlayır. İstəmirsinizsə, Bluetooth-u deaktiv edin." "Wi-Fi və Bluetooth aktiv qalır" "Cihaz təyyarə rejimində Wi‑Fi və Bluetooth-u aktiv saxlayır. İstəmirsinizsə, Wi-Fi və Bluetooth-u deaktiv edin." + "Bluetooth avtomatik aktivləşdirildi" + "Avtomatik yenidən başlatma Bluetooth Ayarlarında dəyişdirilə bilər." + "Deaktiv edin" + "Bluetooth-un avtomatik vəziyyət dəyişikliyi" diff --git a/android/app/res/values-b+sr+Latn/strings.xml b/android/app/res/values-b+sr+Latn/strings.xml index 72fae4bb58..fed1b5137e 100644 --- a/android/app/res/values-b+sr+Latn/strings.xml +++ b/android/app/res/values-b+sr+Latn/strings.xml @@ -135,4 +135,12 @@ "Uređaj pamti da ne treba da isključuje Bluetooth u režimu rada u avionu. Isključite Bluetooth ako ne želite da ostane uključen." "WiFi i Bluetooth ostaju uključeni" "Uređaj pamti da ne treba da isključuje WiFi i Bluetooth u režimu rada u avionu. Isključite WiFi i Bluetooth ako ne želite da ostanu uključeni." + + + + + + + + diff --git a/android/app/res/values-be/strings.xml b/android/app/res/values-be/strings.xml index ae610a6208..24f46fa237 100644 --- a/android/app/res/values-be/strings.xml +++ b/android/app/res/values-be/strings.xml @@ -135,4 +135,12 @@ "На прыладзе ў рэжыме палёту Bluetooth застанецца ўключаным, але вы можаце выключыць яго." "Wi-Fi і Bluetooth застаюцца ўключанымі" "На прыладзе ў рэжыме палёту Wi‑Fi і Bluetooth будуць заставацца ўключанымі, але вы можаце выключыць іх." + + + + + + + + diff --git a/android/app/res/values-bg/strings.xml b/android/app/res/values-bg/strings.xml index 54226c3deb..c93e9659e4 100644 --- a/android/app/res/values-bg/strings.xml +++ b/android/app/res/values-bg/strings.xml @@ -135,4 +135,12 @@ "Функцията за Bluetooth ще бъде включена, докато устройството ви е в самолетен режим. Ако не искате това, изключете я." "Функциите за Wi-Fi и Bluetooth няма да бъдат изключени" "Функциите за Wi‑Fi и Bluetooth ще бъдат включени, докато устройството ви е в самолетен режим. Ако не искате това, изключете ги." + + + + + + + + diff --git a/android/app/res/values-bn/strings.xml b/android/app/res/values-bn/strings.xml index 2ced67bb33..589c3c6a4a 100644 --- a/android/app/res/values-bn/strings.xml +++ b/android/app/res/values-bn/strings.xml @@ -135,4 +135,12 @@ "\'বিমান মোড\'-এ থাকাকালীন আপনার ডিভাইস ব্লুটুথ চালু রাখে। আপনি ব্লুটুথ চালু না রাখতে চাইলে এটি বন্ধ করুন।" "ওয়াই-ফাই ও ব্লুটুথ চালু থাকে" "\'বিমান মোড\'-এ থাকাকালীন আপনার ডিভাইস, ওয়াই-ফাই ও ব্লুটুথ চালু রাখে। আপনি যদি ওয়াই-ফাই এবং ব্লুটুথ চালু রাখতে না চান, সেগুলি বন্ধ করে দিন।" + + + + + + + + diff --git a/android/app/res/values-bs/strings.xml b/android/app/res/values-bs/strings.xml index 4622a522b9..722e8edb2d 100644 --- a/android/app/res/values-bs/strings.xml +++ b/android/app/res/values-bs/strings.xml @@ -135,4 +135,8 @@ "Uređaj pamti da Bluetooth treba biti uključen u načinu rada u avionu. Isključite Bluetooth ako ne želite da ostane uključen." "WiFi i Bluetooth ostaju uključeni" "Uređaj pamti da WiFi i Bluetooth trebaju biti uključeni u načinu rada u avionu. Isključite WiFi i Bluetooth ako ne želite da ostanu uključeni." + "Bluetooth je automatski omogućen" + "Automatsko ponovno pokretanje može se uključiti u postavkama Bluetootha." + "Isključi" + "Automatska promjena stanja Bluetootha" diff --git a/android/app/res/values-ca/strings.xml b/android/app/res/values-ca/strings.xml index 97b7df5baa..e3e23681e9 100644 --- a/android/app/res/values-ca/strings.xml +++ b/android/app/res/values-ca/strings.xml @@ -135,4 +135,8 @@ "El dispositiu recorda mantenir el Bluetooth activat en mode d\'avió. Desactiva el Bluetooth si no vols que es quedi activat." "La Wi‑Fi i el Bluetooth es mantenen activats" "El dispositiu recorda mantenir la Wi‑Fi i el Bluetooth activats en mode d\'avió. Desactiva la Wi‑Fi i el Bluetooth si no vols que es quedin activats." + "El Bluetooth s\'ha activat automàticament" + "El reinici automàtic es pot commutar a la configuració del Bluetooth." + "Desactiva" + "Canvi d\'estat automàtic del Bluetooth" diff --git a/android/app/res/values-cs/strings.xml b/android/app/res/values-cs/strings.xml index 817b5af537..6ba616584c 100644 --- a/android/app/res/values-cs/strings.xml +++ b/android/app/res/values-cs/strings.xml @@ -135,4 +135,12 @@ "Zařízení si pamatuje, že má v režimu Letadlo ponechat zapnutý Bluetooth. Pokud nechcete, aby Bluetooth zůstal zapnutý, vypněte ho." "Wi-Fi a Bluetooth zůstávají zapnuté" "Zařízení si pamatuje, že má v režimu Letadlo ponechat zapnutou Wi-Fi a Bluetooth. Pokud nechcete, aby Wi-Fi a Bluetooth zůstaly zapnuté, vypněte je." + + + + + + + + diff --git a/android/app/res/values-da/strings.xml b/android/app/res/values-da/strings.xml index 0b64b50d2f..30648243bd 100644 --- a/android/app/res/values-da/strings.xml +++ b/android/app/res/values-da/strings.xml @@ -135,4 +135,12 @@ "Din enhed beholder Bluetooth aktiveret i flytilstand. Deaktiver Bluetooth, hvis du ikke vil have, at det forbliver aktiveret." "Wi-Fi og Bluetooth forbliver aktiveret" "Din enhed beholder Wi-Fi og Bluetooth aktiveret i flytilstand. Deaktiver Wi-Fi og Bluetooth, hvis du ikke vil have, at de forbliver aktiveret." + + + + + + + + diff --git a/android/app/res/values-de/strings.xml b/android/app/res/values-de/strings.xml index 0f9cb2b0b8..1fbadb5b6c 100644 --- a/android/app/res/values-de/strings.xml +++ b/android/app/res/values-de/strings.xml @@ -135,4 +135,12 @@ "Auf deinem Gerät bleibt Bluetooth im Flugmodus eingeschaltet. Schalte Bluetooth aus, wenn du das nicht möchtest." "WLAN und Bluetooth bleiben eingeschaltet" "Auf deinem Gerät bleiben WLAN und Bluetooth im Flugmodus eingeschaltet. Schalte sie aus, wenn du das nicht möchtest." + + + + + + + + diff --git a/android/app/res/values-el/strings.xml b/android/app/res/values-el/strings.xml index 6913efeb59..ba1cde9a4b 100644 --- a/android/app/res/values-el/strings.xml +++ b/android/app/res/values-el/strings.xml @@ -135,4 +135,8 @@ "Η συσκευή σας θυμάται να διατηρεί ενεργοποιημένο το Bluetooth σε λειτουργία πτήσης. Απενεργοποιήστε το Bluetooth αν δεν θέλετε να παραμένει ενεργοποιημένο." "Το Wi-Fi και το Bluetooth παραμένουν ενεργοποιημένα" "Η συσκευή θυμάται να διατηρεί ενεργοποιημένο το Wi‑Fi και το Bluetooth σε λειτουργία πτήσης. Απενεργοποιήστε το Wi-Fi και το Bluetooth αν δεν θέλετε να παραμένουν ενεργοποιημένα." + "Το Bluetooth ενεργοποιήθηκε αυτόματα" + "Η εναλλαγή της λειτουργίας αυτόματης επανεκκίνησης μπορεί να γίνει από τις Ρυθμίσεις Bluetooth." + "Απενεργοποίηση" + "Αυτόματη αλλαγή κατάστασης Bluetooth" diff --git a/android/app/res/values-en-rAU/strings.xml b/android/app/res/values-en-rAU/strings.xml index 63b65fdd3c..1e7c5a49d8 100644 --- a/android/app/res/values-en-rAU/strings.xml +++ b/android/app/res/values-en-rAU/strings.xml @@ -135,4 +135,12 @@ "Your device remembers to keep Bluetooth on in aeroplane mode. Turn off Bluetooth if you don\'t want it to stay on." "Wi-Fi and Bluetooth stay on" "Your device remembers to keep Wi-Fi and Bluetooth on in aeroplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on." + + + + + + + + diff --git a/android/app/res/values-en-rCA/strings.xml b/android/app/res/values-en-rCA/strings.xml index 08c08ce2c9..f875ac7926 100644 --- a/android/app/res/values-en-rCA/strings.xml +++ b/android/app/res/values-en-rCA/strings.xml @@ -135,4 +135,8 @@ "Your device remembers to keep Bluetooth on in airplane mode. Turn off Bluetooth if you don\'t want it to stay on." "Wi-Fi and Bluetooth stay on" "Your device remembers to keep Wi-Fi and Bluetooth on in airplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on." + "Bluetooth has been automatically enabled" + "Automatic restart can be toggled in Bluetooth Settings." + "Turn off" + "Bluetooth automatic state change" diff --git a/android/app/res/values-en-rGB/strings.xml b/android/app/res/values-en-rGB/strings.xml index 63b65fdd3c..1e7c5a49d8 100644 --- a/android/app/res/values-en-rGB/strings.xml +++ b/android/app/res/values-en-rGB/strings.xml @@ -135,4 +135,12 @@ "Your device remembers to keep Bluetooth on in aeroplane mode. Turn off Bluetooth if you don\'t want it to stay on." "Wi-Fi and Bluetooth stay on" "Your device remembers to keep Wi-Fi and Bluetooth on in aeroplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on." + + + + + + + + diff --git a/android/app/res/values-en-rIN/strings.xml b/android/app/res/values-en-rIN/strings.xml index 63b65fdd3c..1e7c5a49d8 100644 --- a/android/app/res/values-en-rIN/strings.xml +++ b/android/app/res/values-en-rIN/strings.xml @@ -135,4 +135,12 @@ "Your device remembers to keep Bluetooth on in aeroplane mode. Turn off Bluetooth if you don\'t want it to stay on." "Wi-Fi and Bluetooth stay on" "Your device remembers to keep Wi-Fi and Bluetooth on in aeroplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on." + + + + + + + + diff --git a/android/app/res/values-en-rXC/strings.xml b/android/app/res/values-en-rXC/strings.xml index 7252063f0f..80df24c1fd 100644 --- a/android/app/res/values-en-rXC/strings.xml +++ b/android/app/res/values-en-rXC/strings.xml @@ -135,4 +135,8 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎Your device remembers to keep Bluetooth on in airplane mode. Turn off Bluetooth if you don\'t want it to stay on.‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎Wi-Fi and Bluetooth stay on‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‎Your device remembers to keep Wi-Fi and Bluetooth on in airplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on.‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎Bluetooth has been automatically enabled‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‎Automatic restart can be toggled in Bluetooth Settings.‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎Turn off‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎Bluetooth automatic state change‎‏‎‎‏‎" diff --git a/android/app/res/values-es-rUS/strings.xml b/android/app/res/values-es-rUS/strings.xml index efa8782e2f..a013f620af 100644 --- a/android/app/res/values-es-rUS/strings.xml +++ b/android/app/res/values-es-rUS/strings.xml @@ -135,4 +135,12 @@ "El dispositivo dejará activado el Bluetooth en el modo de avión. Desactiva el Bluetooth si no quieres que permanezca activado." "El Wi-Fi y el Bluetooth permanecen activados" "El dispositivo dejará activado el Wi-Fi y el Bluetooth en el modo de avión. Desactívalos si no quieres que permanezcan activados." + + + + + + + + diff --git a/android/app/res/values-es/strings.xml b/android/app/res/values-es/strings.xml index f797d30d9e..a1e1096560 100644 --- a/android/app/res/values-es/strings.xml +++ b/android/app/res/values-es/strings.xml @@ -135,4 +135,8 @@ "Tu dispositivo se acordará de mantener activado el Bluetooth en modo Avión. Desactiva el Bluetooth si no quieres que permanezca activado." "El Wi-Fi y el Bluetooth permanecen activados" "Tu dispositivo se acordará de mantener activados el Wi-Fi y el Bluetooth en modo Avión. Desactívalos si no quieres que permanezcan activados." + "El Bluetooth se ha habilitado automáticamente" + "El reinicio automático se puede activar o desactivar en los ajustes del Bluetooth." + "Desactivar" + "Cambio de estado automático del Bluetooth" diff --git a/android/app/res/values-et/strings.xml b/android/app/res/values-et/strings.xml index 627ef39f50..d11907f901 100644 --- a/android/app/res/values-et/strings.xml +++ b/android/app/res/values-et/strings.xml @@ -135,4 +135,8 @@ "Teie seade hoiab Bluetoothi lennukirežiimis sisselülitatuna. Lülitage Bluetooth välja, kui te ei soovi, et see oleks sisse lülitatud." "WiFi ja Bluetoothi jäävad sisselülitatuks" "Teie seade hoiab WiFi ja Bluetoothi lennukirežiimis sisselülitatuna. Lülitage WiFi ja Bluetooth välja, kui te ei soovi, et need oleksid sisse lülitatud." + "Bluetooth on automaatselt lubatud" + "Automaatse taaskäivitamise saab sisse lülitada Bluetoothi seadetes." + "Lülita välja" + "Bluetoothi oleku automaatne muutmine" diff --git a/android/app/res/values-eu/strings.xml b/android/app/res/values-eu/strings.xml index 25ff50eb6f..24d8aed471 100644 --- a/android/app/res/values-eu/strings.xml +++ b/android/app/res/values-eu/strings.xml @@ -135,4 +135,12 @@ "Hegaldi moduan, Bluetootha aktibatuta mantentzeaz gogoratzen da gailua. Halakorik nahi ez baduzu, desaktiba ezazu zuk zeuk." "Wifia eta Bluetootha aktibatuta mantentzen dira" "Hegaldi moduan, wifia eta Bluetootha aktibatuta mantentzeaz gogoratzen da gailua. Halakorik nahi ez baduzu, desaktiba itzazu zuk zeuk." + + + + + + + + diff --git a/android/app/res/values-fa/strings.xml b/android/app/res/values-fa/strings.xml index b6163c637c..6aa5474add 100644 --- a/android/app/res/values-fa/strings.xml +++ b/android/app/res/values-fa/strings.xml @@ -135,4 +135,12 @@ "دستگاهتان به‌یاد می‌آورد که بلوتوث را در «حالت هواپیما» روشن نگه دارد. اگر نمی‌خواهید بلوتوث روشن بماند، آن را خاموش کنید." "‏‫Wi-Fi و بلوتوث روشن بماند" "‏دستگاهتان به‌یاد می‌آورد که Wi-Fi و بلوتوث را در «حالت هواپیما» روشن نگه دارد. اگر نمی‌خواهید Wi-Fi و بلوتوث روشن بمانند، آن‌ها را خاموش کنید." + + + + + + + + diff --git a/android/app/res/values-fi/strings.xml b/android/app/res/values-fi/strings.xml index 39069a6161..db9cabf177 100644 --- a/android/app/res/values-fi/strings.xml +++ b/android/app/res/values-fi/strings.xml @@ -135,4 +135,12 @@ "Laitteen Bluetooth pysyy päällä lentokonetilassa. Voit halutessasi laittaa Bluetooth-yhteyden pois päältä." "Wi-Fi ja Bluetooth pysyvät päällä" "Laitteen Wi-Fi-yhteys ja Bluetooth pysyvät päällä lentokonetilassa. Voit halutessasi laittaa ne pois päältä." + + + + + + + + diff --git a/android/app/res/values-fr-rCA/strings.xml b/android/app/res/values-fr-rCA/strings.xml index 46eea189da..e4de284699 100644 --- a/android/app/res/values-fr-rCA/strings.xml +++ b/android/app/res/values-fr-rCA/strings.xml @@ -135,4 +135,12 @@ "Votre appareil se souvient de garder le Bluetooth activé en mode Avion. Désactivez le Bluetooth si vous ne souhaitez pas qu\'il reste activé." "Le Wi-Fi et le Bluetooth restent activés" "Votre appareil se souvient de garder le Wi-Fi et le Bluetooth activés en mode Avion. Désactivez le Wi-Fi et le Bluetooth si vous ne souhaitez pas qu\'ils restent activés." + + + + + + + + diff --git a/android/app/res/values-fr/strings.xml b/android/app/res/values-fr/strings.xml index 1072b8bb33..53e2802ee8 100644 --- a/android/app/res/values-fr/strings.xml +++ b/android/app/res/values-fr/strings.xml @@ -135,4 +135,8 @@ "Le Bluetooth de votre appareil restera activé en mode Avion, mais vous pouvez le désactiver." "Le Wi-Fi et le Bluetooth restent activés" "Le Wi‑Fi et le Bluetooth de votre appareil resteront activés en mode Avion, mais vous pouvez les désactivez." + "Le Bluetooth a été activé automatiquement" + "Le redémarrage automatique peut être activé ou désactivé depuis les paramètres Bluetooth." + "Désactiver" + "Changement de statut automatique du Bluetooth" diff --git a/android/app/res/values-gl/strings.xml b/android/app/res/values-gl/strings.xml index fc6ad69a4f..5e176a3120 100644 --- a/android/app/res/values-gl/strings.xml +++ b/android/app/res/values-gl/strings.xml @@ -135,4 +135,12 @@ "O teu dispositivo lembrará manter o Bluetooth activado no modo avión. Se non queres que permaneza nese estado, desactívao." "A wifi e o Bluetooth permanecen activados" "O teu dispositivo lembrará manter a wifi e o Bluetooth activados no modo avión. Se non queres que permanezan nese estado, desactívaos." + + + + + + + + diff --git a/android/app/res/values-gu/strings.xml b/android/app/res/values-gu/strings.xml index a97789cd24..d00949ab45 100644 --- a/android/app/res/values-gu/strings.xml +++ b/android/app/res/values-gu/strings.xml @@ -135,4 +135,12 @@ "તમારું ડિવાઇસ બ્લૂટૂથને એરપ્લેન મોડમાં ચાલુ રાખવાનું યાદ રાખે છે. જો તમે બ્લૂટૂથ ચાલુ રાખવા માગતા ન હો, તો તેને બંધ કરો." "વાઇ-ફાઇ અને બ્લૂટૂથ ચાલુ રહે છે" "તમારું ડિવાઇસ વાઇ-ફાઇ અને બ્લૂટૂથને એરપ્લેન મોડમાં ચાલુ રાખવાનું યાદ રાખે છે. જો તમે વાઇ-ફાઇ અને બ્લૂટૂથ ચાલુ રાખવા માગતા ન હો, તો તેને બંધ કરો." + + + + + + + + diff --git a/android/app/res/values-hi/strings.xml b/android/app/res/values-hi/strings.xml index c9067a50e2..5b28bdac4f 100644 --- a/android/app/res/values-hi/strings.xml +++ b/android/app/res/values-hi/strings.xml @@ -135,4 +135,12 @@ "फ़्लाइट मोड में भी, आपके डिवाइस का ब्लूटूथ चालू रहता है. अगर ब्लूटूथ चालू नहीं रखना है, तो उसे बंद कर दें." "वाई-फ़ाई और ब्लूटूथ चालू रहते हैं" "फ़्लाइट मोड में भी, आपके डिवाइस का वाई-फ़ाई और ब्लूटूथ चालू रहता है. अगर वाई-फ़ाई और ब्लूटूथ को चालू नहीं रखना है, तो उन्हें बंद कर दें." + + + + + + + + diff --git a/android/app/res/values-hr/strings.xml b/android/app/res/values-hr/strings.xml index d58de00187..c6005390d2 100644 --- a/android/app/res/values-hr/strings.xml +++ b/android/app/res/values-hr/strings.xml @@ -135,4 +135,8 @@ "Uređaj će zapamtiti da Bluetooth treba ostati uključen u načinu rada u zrakoplovu. Isključite Bluetooth ako ne želite da ostane uključen." "Wi-Fi i Bluetooth ostat će uključeni" "Uređaj će zapamtiti da Wi‑Fi i Bluetooth trebaju ostati uključeni u načinu rada u zrakoplovu. Isključite Wi-Fi i Bluetooth ako ne želite da ostanu uključeni." + "Bluetooth je automatski omogućen" + "Automatsko ponovno pokretanje može se uključiti u postavkama Bluetootha." + "Isključi" + "Automatska promjena stanja Bluetootha" diff --git a/android/app/res/values-hu/strings.xml b/android/app/res/values-hu/strings.xml index 3af5b97385..0de5d2a747 100644 --- a/android/app/res/values-hu/strings.xml +++ b/android/app/res/values-hu/strings.xml @@ -135,4 +135,12 @@ "Az eszköz bekapcsolva tartja a Bluetootht Repülős üzemmódban. Kapcsolja ki a Bluetootht, ha nem szeretné, hogy bekapcsolva maradjon." "A Wi-Fi és a Bluetooth bekapcsolva marad" "Az eszköz bekapcsolva tartja a Wi‑Fi-t és a Bluetootht Repülős üzemmódban. Ha nem szeretné, hogy bekapcsolva maradjon a Wi-Fi és a Bluetooth, kapcsolja ki őket." + + + + + + + + diff --git a/android/app/res/values-hy/strings.xml b/android/app/res/values-hy/strings.xml index 25d55fcea6..ea50a39510 100644 --- a/android/app/res/values-hy/strings.xml +++ b/android/app/res/values-hy/strings.xml @@ -135,4 +135,12 @@ "Ավիառեժիմում Bluetooth-ը միացված կմնա։ Ցանկության դեպքում կարող եք անջատել Bluetooth-ը։" "Wi-Fi-ը և Bluetooth-ը մնում են միացված" "Ավիառեժիմում Wi-Fi-ը և Bluetooth-ը միացված կմնան։ Ցանկության դեպքում կարող եք անջատել Wi-Fi-ը և Bluetooth-ը։" + + + + + + + + diff --git a/android/app/res/values-in/strings.xml b/android/app/res/values-in/strings.xml index dcfc4bb8f7..822d50395f 100644 --- a/android/app/res/values-in/strings.xml +++ b/android/app/res/values-in/strings.xml @@ -135,4 +135,12 @@ "Perangkat akan mengingat untuk tetap mengaktifkan Bluetooth dalam mode pesawat. Nonaktifkan jika Anda tidak ingin Bluetooth terus aktif." "Wi-Fi dan Bluetooth tetap aktif" "Perangkat akan mengingat untuk tetap mengaktifkan Wi-Fi dan Bluetooth dalam mode pesawat. Nonaktifkan jika Anda tidak ingin Wi-Fi dan Bluetooth terus aktif." + + + + + + + + diff --git a/android/app/res/values-is/strings.xml b/android/app/res/values-is/strings.xml index 5f6bb2275b..527c1f9586 100644 --- a/android/app/res/values-is/strings.xml +++ b/android/app/res/values-is/strings.xml @@ -135,4 +135,12 @@ "Tækið man að hafa kveikt á Bluetooth í flugstillingu. Slökktu á Bluetooth ef þú vilt ekki hafa kveikt á því." "Áfram verður kveikt á Wi-Fi og Bluetooth" "Tæki man að hafa kveikt á Wi-Fi og Bluetooth í flugstillingu. Slökktu á Wi-Fi og Bluetooth ef þú vilt ekki hafa kveikt á þessu." + + + + + + + + diff --git a/android/app/res/values-it/strings.xml b/android/app/res/values-it/strings.xml index 2c06b240d8..991e8a4913 100644 --- a/android/app/res/values-it/strings.xml +++ b/android/app/res/values-it/strings.xml @@ -135,4 +135,8 @@ "Il dispositivo memorizza che deve tenere attivo il Bluetooth in modalità aereo. Disattiva il Bluetooth se non vuoi tenerlo attivo." "Wi-Fi e Bluetooth rimangono attivi" "Il dispositivo memorizza che deve tenere attivi il Wi‑Fi e il Bluetooth in modalità aereo. Disattiva il Wi-Fi e il Bluetooth se non vuoi tenerli attivi." + "Il Bluetooth è stato attivato automaticamente" + "È possibile attivare/disattivare il riavvio automatico nelle impostazioni del Bluetooth." + "Disattiva" + "Modifica dello stato automatico del Bluetooth" diff --git a/android/app/res/values-iw/strings.xml b/android/app/res/values-iw/strings.xml index c3ee301fee..f0b2c79f6d 100644 --- a/android/app/res/values-iw/strings.xml +++ b/android/app/res/values-iw/strings.xml @@ -135,4 +135,12 @@ "‏חיבור ה-Bluetooth במכשיר יישאר מופעל במצב טיסה. אפשר להשבית את ה-Bluetooth אם לא רוצים שהוא יפעל." "‏חיבורי ה-Wi‑Fi וה-Bluetooth יישארו מופעלים" "‏חיבורי ה-Wi‑Fi וה-Bluetooth במכשיר יישארו מופעלים במצב טיסה. אפשר להשבית את ה-Wi-Fi וה-Bluetooth אם לא רוצים שהם יפעלו." + + + + + + + + diff --git a/android/app/res/values-ja/strings.xml b/android/app/res/values-ja/strings.xml index 3eb1588a23..076e002e88 100644 --- a/android/app/res/values-ja/strings.xml +++ b/android/app/res/values-ja/strings.xml @@ -135,4 +135,8 @@ "機内モードでも、デバイスの Bluetooth は ON のままになります。Bluetooth を ON にしたくない場合は OFF にしてください。" "Wi-Fi と Bluetooth を ON のままにする" "機内モードでも、デバイスの Wi-Fi と Bluetooth は ON のままになります。Wi-Fi と Bluetooth を ON にしたくない場合は OFF にしてください。" + "Bluetooth は自動で有効になりました" + "自動再起動は [Bluetooth の設定] で切り替えられます。" + "OFF にする" + "Bluetooth の自動状態変更" diff --git a/android/app/res/values-ka/strings.xml b/android/app/res/values-ka/strings.xml index 9ddb66ef97..2f25322d23 100644 --- a/android/app/res/values-ka/strings.xml +++ b/android/app/res/values-ka/strings.xml @@ -135,4 +135,8 @@ "თქვენს მოწყობილობას ახსოვს, რომ Bluetooth ჩართული დატოვოს თვითმფრინავის რეჟიმში. გამორთეთ Bluetooth, თუ არ გსურთ, რომ ის ჩართული იყოს." "Wi-Fi და Bluetooth ჩართული დარჩება" "თქვენს მოწყობილობას ახსოვს, რომ Wi‑Fi და Bluetooth ჩართული დატოვოს თვითმფრინავის რეჟიმში. გამორთეთ Wi-Fi და Bluetooth, თუ არ გსურთ, რომ ისინი ჩართული იყოს." + "Bluetooth ჩართულია ავტომატურად" + "ავტომატური გადატვირთვის გადართვა შესაძლებელია Bluetooth-ის პარამეტრებიდან." + "გამორთვა" + "Bluetooth-ის მდგომარეობის ავტომატური შეცვლა" diff --git a/android/app/res/values-kk/strings.xml b/android/app/res/values-kk/strings.xml index a19e286775..a8db80af15 100644 --- a/android/app/res/values-kk/strings.xml +++ b/android/app/res/values-kk/strings.xml @@ -135,4 +135,12 @@ "Bluetooth ұшақ режимінде қосылып тұрады. Қаласаңыз, оны өшіріп қоюыңызға болады." "Wi-Fi мен Bluetooth қосулы тұрады" "Wi‑Fi мен Bluetooth ұшақ режимінде қосылып тұрады. Қаласаңыз, оларды өшіріп қоюыңызға болады." + + + + + + + + diff --git a/android/app/res/values-km/strings.xml b/android/app/res/values-km/strings.xml index c17e0eb5e5..556a3d6b4b 100644 --- a/android/app/res/values-km/strings.xml +++ b/android/app/res/values-km/strings.xml @@ -135,4 +135,8 @@ "ឧបករណ៍របស់អ្នក​ចាំថាត្រូវបន្តបើកប៊្លូធូស​នៅក្នុង​មុខងារពេលជិះយន្តហោះ។ បិទប៊្លូធូស ប្រសិនបើអ្នក​មិនចង់ឱ្យបន្តបើកទេ។" "Wi-Fi និងប៊្លូធូស​បន្តបើក" "ឧបករណ៍របស់អ្នក​ចាំថាត្រូវបន្តបើក Wi-Fi និងប៊្លូធូស​នៅក្នុង​មុខងារពេលជិះយន្តហោះ។ បិទ Wi-Fi និង​ប៊្លូធូស ប្រសិនបើអ្នក​មិនចង់ឱ្យបន្តបើកទេ។" + "ប៊្លូធូសត្រូវបានបើកដោយស្វ័យប្រវត្តិ" + "អាចបិទ/បើកការចាប់ផ្ដើម​ឡើងវិញស្វ័យប្រវត្តិនៅក្នុងការកំណត់ប៊្លូធូស។" + "បិទ" + "ការផ្លាស់ប្ដូរស្ថានភាពស្វ័យប្រវត្តិរបស់ប៊្លូធូស" diff --git a/android/app/res/values-kn/strings.xml b/android/app/res/values-kn/strings.xml index 3a344bef35..82be48a7e4 100644 --- a/android/app/res/values-kn/strings.xml +++ b/android/app/res/values-kn/strings.xml @@ -135,4 +135,12 @@ "ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ನಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರಿಸಿಕೊಳ್ಳುವುದನ್ನು ನಿಮ್ಮ ಸಾಧನ ನೆನಪಿನಲ್ಲಿರಿಸಿಕೊಳ್ಳುತ್ತದೆ. ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರಿಸಲು ನೀವು ಬಯಸದಿದ್ದರೆ ಅದನ್ನು ಆಫ್ ಮಾಡಿ." "ವೈ-ಫೈ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರುತ್ತದೆ" "ವೈ-ಫೈ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಅನ್ನು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ನಲ್ಲಿ ಇರಿಸಿಕೊಳ್ಳಲು ನಿಮ್ಮ ಸಾಧನ ನೆನಪಿನಲ್ಲಿರಿಸಿಕೊಳ್ಳುತ್ತದೆ. ವೈಫೈ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರಿಸಲು ನೀವು ಬಯಸದಿದ್ದರೆ ಅವುಗಳನ್ನು ಆಫ್ ಮಾಡಿ." + + + + + + + + diff --git a/android/app/res/values-ko/strings.xml b/android/app/res/values-ko/strings.xml index f06cdebde0..ed0785fbb8 100644 --- a/android/app/res/values-ko/strings.xml +++ b/android/app/res/values-ko/strings.xml @@ -135,4 +135,12 @@ "비행기 모드에서 기기의 블루투스가 켜진 상태로 유지됩니다. 유지하지 않으려면 블루투스를 사용 중지하세요." "Wi-Fi 및 블루투스 계속 사용" "비행기 모드에서 기기의 Wi-Fi 및 블루투스가 켜진 상태로 유지됩니다. 유지하지 않으려면 Wi-Fi와 블루투스를 사용 중지하세요." + + + + + + + + diff --git a/android/app/res/values-ky/strings.xml b/android/app/res/values-ky/strings.xml index 526285cbe3..fc2ae6ad6b 100644 --- a/android/app/res/values-ky/strings.xml +++ b/android/app/res/values-ky/strings.xml @@ -135,4 +135,12 @@ "Түзмөгүңүз учак режиминде Bluetooth\'га туташкан бойдон калат. Кааласаңыз, Bluetooth\'ду өчүрүп койсоңуз болот." "Wi-Fi менен Bluetooth күйүк бойдон калат" "Түзмөгүңүз учак режиминде Wi‑Fi\'га жана Bluetooth\'га туташкан бойдон калат. Кааласаңыз, Wi-Fi менен Bluetooth\'ду өчүрүп койсоңуз болот." + + + + + + + + diff --git a/android/app/res/values-lo/strings.xml b/android/app/res/values-lo/strings.xml index f32b40f560..a9bdba6b65 100644 --- a/android/app/res/values-lo/strings.xml +++ b/android/app/res/values-lo/strings.xml @@ -135,4 +135,8 @@ "ອຸປະກອນຂອງທ່ານຈື່ວ່າຈະຕ້ອງເປີດ Bluetooth ປະໄວ້ໃນໂໝດຢູ່ໃນຍົນ. ປິດ Bluetooth ຫາກທ່ານບໍ່ຕ້ອງການໃຫ້ເປີດປະໄວ້." "Wi-Fi ແລະ Bluetooth ຈະເປີດປະໄວ້" "ອຸປະກອນຂອງທ່ານຈື່ວ່າຈະຕ້ອງເປີດ Wi-Fi ແລະ Bluetooth ປະໄວ້ໃນໂໝດຢູ່ໃນຍົນ. ປິດ Wi-Fi ແລະ Bluetooth ຫາກທ່ານບໍ່ຕ້ອງການໃຫ້ເປີດປະໄວ້." + "Bluetooth ຖືກເປີດການນຳໃຊ້ໂດຍອັດຕະໂນມັດ" + "ສາມາດເປີດ/ປິດການຣີສະຕາດອັດຕະໂນມັດໄດ້ໃນການຕັ້ງຄ່າ Bluetooth." + "ປິດ" + "ການປ່ຽນສະຖານະ Bluetooth ອັດຕະໂນມັດ" diff --git a/android/app/res/values-lt/strings.xml b/android/app/res/values-lt/strings.xml index c87bb0431d..a41898cad6 100644 --- a/android/app/res/values-lt/strings.xml +++ b/android/app/res/values-lt/strings.xml @@ -135,4 +135,12 @@ "Įrenginys prisimena, kad lėktuvo režimu reikia palikti įjungtą „Bluetooth“ ryšį. Išjunkite „Bluetooth“, jei nenorite, kad jis liktų įjungtas." "„Wi‑Fi“ ir „Bluetooth“ ryšys lieka įjungtas" "Įrenginys prisimena, kad lėktuvo režimu reikia palikti įjungtą „Wi‑Fi“ ir „Bluetooth“ ryšį. Išjunkite „Wi-Fi“ ir „Bluetooth“, jei nenorite, kad jie liktų įjungti." + + + + + + + + diff --git a/android/app/res/values-lv/strings.xml b/android/app/res/values-lv/strings.xml index 48ab462cae..626f89e45f 100644 --- a/android/app/res/values-lv/strings.xml +++ b/android/app/res/values-lv/strings.xml @@ -135,4 +135,12 @@ "Lidojuma režīmā ierīcē joprojām būs ieslēgts Bluetooth savienojums. Izslēdziet Bluetooth savienojumu, ja nevēlaties, lai tas paliktu ieslēgts." "Wi-Fi savienojums un tehnoloģija Bluetooth paliek ieslēgta" "Lidojuma režīmā ierīcē joprojām būs ieslēgti Wi-Fi un Bluetooth savienojumi. Izslēdziet Wi-Fi un Bluetooth savienojumus, ja nevēlaties, lai tie paliktu ieslēgti." + + + + + + + + diff --git a/android/app/res/values-mk/strings.xml b/android/app/res/values-mk/strings.xml index 06aff8ce98..3da12700d5 100644 --- a/android/app/res/values-mk/strings.xml +++ b/android/app/res/values-mk/strings.xml @@ -135,4 +135,12 @@ "Уредот помни да го задржи Bluetooth вклучен во авионски режим. Исклучете го Bluetooth ако не сакате да остане вклучен." "Wi-Fi и Bluetooth остануваат вклучени" "Уредот помни да ги задржи Wi‑Fi и Bluetooth вклучени во авионски режим. Исклучете ги Wi-Fi и Bluetooth ако не сакате да бидат вклучени." + + + + + + + + diff --git a/android/app/res/values-ml/strings.xml b/android/app/res/values-ml/strings.xml index a716527572..a6b8192748 100644 --- a/android/app/res/values-ml/strings.xml +++ b/android/app/res/values-ml/strings.xml @@ -135,4 +135,8 @@ "ഫ്ലൈറ്റ് മോഡിലായിരിക്കുമ്പോൾ Bluetooth ഓണാക്കി വയ്ക്കാൻ നിങ്ങളുടെ ഉപകരണം ഓർമ്മിക്കുന്നു. Bluetooth ഓണാക്കി വയ്ക്കാൻ താൽപ്പര്യമില്ലെങ്കിൽ അത് ഓഫാക്കുക." "വൈഫൈ, Bluetooth എന്നിവ ഓണായ നിലയിൽ തുടരും" "ഫ്ലൈറ്റ് മോഡിലായിരിക്കുമ്പോൾ വൈഫൈ, Bluetooth എന്നിവ ഓണാക്കി വയ്ക്കാൻ നിങ്ങളുടെ ഉപകരണം ഓർമ്മിക്കുന്നു. വൈഫൈ, Bluetooth എന്നിവ ഓണാക്കി വയ്‌ക്കാൻ താൽപ്പര്യമില്ലെങ്കിൽ അവ ഓഫാക്കുക." + "Bluetooth സ്വയമേവ പ്രവർത്തനക്ഷമമാക്കി" + "Bluetooth ക്രമീകരണത്തിൽ സ്വയമേവയുള്ള റീസ്റ്റാർട്ട് ടോഗിൾ ചെയ്യാനാകും." + "ഓഫാക്കുക" + "Bluetooth നിലയുടെ സ്വയമേവയുള്ള മാറ്റം" diff --git a/android/app/res/values-mn/strings.xml b/android/app/res/values-mn/strings.xml index 373314b82a..3c3b110889 100644 --- a/android/app/res/values-mn/strings.xml +++ b/android/app/res/values-mn/strings.xml @@ -135,4 +135,12 @@ "Таны төхөөрөмж Bluetooth-г нислэгийн горимд асаалттай байлгахыг санана. Хэрэв та асаалттай байлгахыг хүсэхгүй байвал Bluetooth-г унтраана уу." "Wi-Fi болон Bluetooth асаалттай хэвээр байна" "Таны төхөөрөмж Wi-Fi болон Bluetooth-г нислэгийн горимд асаалттай байлгахыг санана. Хэрэв та Wi-Fi болон Bluetooth-г асаалттай байлгахыг хүсэхгүй байвал тэдгээрийг унтраана уу." + + + + + + + + diff --git a/android/app/res/values-mr/strings.xml b/android/app/res/values-mr/strings.xml index 6a3ebcce31..1b0a81e78f 100644 --- a/android/app/res/values-mr/strings.xml +++ b/android/app/res/values-mr/strings.xml @@ -135,4 +135,8 @@ "तुमचे डिव्हाइस विमान मोडमध्ये ब्लूटूथ सुरू ठेवण्याचे लक्षात ठेवते. तुम्हाला ब्लूटूथ सुरू ठेवायचे नसल्यास ते बंद करा." "वाय-फाय आणि ब्लूटूथ सुरू राहते" "तुमचे डिव्हाइस विमान मोडमध्ये वाय-फाय आणि ब्लूटूथ सुरू ठेवण्याचे लक्षात ठेवते. तुम्हाला वाय-फाय आणि ब्लूटूथ सुरू ठेवायचे नसल्यास ते बंद करा." + "ब्लूटूथ आपोआप सुरू करण्यात आले आहे" + "ब्लूटूथ सेटिंग्ज मध्ये ऑटोमॅटिक रीस्टार्ट टॉगल केले जाऊ शकते." + "बंद करा" + "ब्लूटूथची स्थिती आपोआप बदलणे" diff --git a/android/app/res/values-ms/strings.xml b/android/app/res/values-ms/strings.xml index 331b40d9e9..613532cab0 100644 --- a/android/app/res/values-ms/strings.xml +++ b/android/app/res/values-ms/strings.xml @@ -135,4 +135,8 @@ "Peranti anda diingatkan untuk terus menghidupkan Bluetooth dalam mod pesawat. Matikan Bluetooth jika anda tidak mahu Bluetooth sentiasa hidup." "Wi-Fi dan Bluetooth kekal dihidupkan" "Peranti anda diingatkan untuk terus menghidupkan Wi-Fi dan Bluetooth dalam mod pesawat. Matikan Wi-Fi dan Bluetooth jika anda tidak mahu Wi-Fi dan Bluetooth sentiasa hidup." + "Bluetooth telah didayakan secara automatik" + "Mulakan semula automatik boleh ditogol dalam Tetapan Bluetooth." + "Matikan" + "Perubahan keadaan automatik Bluetooth" diff --git a/android/app/res/values-my/strings.xml b/android/app/res/values-my/strings.xml index 34f0aa4d6c..1ceb35b0bb 100644 --- a/android/app/res/values-my/strings.xml +++ b/android/app/res/values-my/strings.xml @@ -135,4 +135,12 @@ "လေယာဉ်ပျံမုဒ်သုံးစဉ် ဘလူးတုသ် ဆက်ဖွင့်ထားရန် သင့်စက်က မှတ်မိသည်။ ဘလူးတုသ် ဆက်ဖွင့်မထားလိုပါက ပိတ်နိုင်သည်။" "Wi-Fi နှင့် ဘလူးတုသ် ဆက်ဖွင့်ထားသည်" "လေယာဉ်ပျံမုဒ်သုံးစဉ် Wi-Fi နှင့် ဘလူးတုသ် ဆက်ဖွင့်ထားရန် သင့်စက်က မှတ်မိသည်။ Wi-Fi နှင့် ဘလူးတုသ် ဆက်ဖွင့်မထားလိုပါက ပိတ်နိုင်သည်။" + + + + + + + + diff --git a/android/app/res/values-nb/strings.xml b/android/app/res/values-nb/strings.xml index 1915382505..fe754cb2bc 100644 --- a/android/app/res/values-nb/strings.xml +++ b/android/app/res/values-nb/strings.xml @@ -135,4 +135,12 @@ "Enheten husker at Bluetooth skal være på i flymodus. Slå av Bluetooth hvis du ikke vil at det skal være på." "Wifi og Bluetooth holdes påslått" "Enheten husker at wifi og Bluetooth skal være på i flymodus. Slå av wifi og Bluetooth hvis du ikke vil at de skal være på." + + + + + + + + diff --git a/android/app/res/values-ne/strings.xml b/android/app/res/values-ne/strings.xml index f39ec07666..ab17805530 100644 --- a/android/app/res/values-ne/strings.xml +++ b/android/app/res/values-ne/strings.xml @@ -135,4 +135,8 @@ "तपाईंको डिभाइस अर्को पटक हवाइजहाज मोडमा लैजाँदा तपाईंको फोनले ब्लुटुथ अन राख्नु पर्ने कुरा याद गर्छ। तपाईं ब्लुटुथ अन भइनरहोस् भन्ने चाहनुहुन्छ भने ब्लुटुथ अफ गर्नुहोस्।" "Wi-Fi र ब्लुटुथ अन रहिरहने छन्" "हवाइजहाज मोडमा पनि तपाईंको डिभाइसको Wi-Fi र ब्लुटुथ अन नै रहिरहने छन्। तपाईं Wi-Fi र ब्लुटुथ अन भइनरहोस् भन्ने चाहनुहुन्छ भने तिनलाई अफ गर्नुहोस्।" + "ब्लुटुथ स्वतः अन गरिएको छ" + "स्वतः रिस्टार्ट गर्ने सुविधा ब्लुटुथसम्बन्धी सेटिङमा गई अन/अफ गर्न सकिन्छ।" + "अफ गर्नुहोस्" + "ब्लुटुथको स्थिति स्वतः परिवर्तन गरियो" diff --git a/android/app/res/values-nl/strings.xml b/android/app/res/values-nl/strings.xml index e59f12ff15..e5f90da12e 100644 --- a/android/app/res/values-nl/strings.xml +++ b/android/app/res/values-nl/strings.xml @@ -135,4 +135,8 @@ "Bluetooth op je apparaat blijft aan in de vliegtuigmodus. Zet bluetooth uit als je niet wilt dat dit aan blijft." "Wifi en bluetooth blijven aan" "Wifi en bluetooth op je apparaat blijven aan in de vliegtuigmodus. Zet wifi en bluetooth uit als je niet wilt dat ze aan blijven." + "Bluetooth is automatisch aangezet" + "Je kunt Automatisch opnieuw opstarten aan- of uitzetten in de bluetooth-instellingen." + "Uitzetten" + "Automatische wijziging in status van bluetooth" diff --git a/android/app/res/values-or/strings.xml b/android/app/res/values-or/strings.xml index 0f4ab29f05..bf2b3528ad 100644 --- a/android/app/res/values-or/strings.xml +++ b/android/app/res/values-or/strings.xml @@ -135,4 +135,12 @@ "ଆପଣଙ୍କ ଡିଭାଇସ ଏୟାରପ୍ଲେନ ମୋଡରେ ବ୍ଲୁଟୁଥକୁ ଚାଲୁ ରଖିବା ପାଇଁ ମନେ ରଖେ। ଯଦି ଆପଣ ବ୍ଲୁଟୁଥ ଚାଲୁ ରହୁ ବୋଲି ଚାହୁଁନାହାଁନ୍ତି ତେବେ ଏହାକୁ ବନ୍ଦ କରନ୍ତୁ।" "ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥ ଚାଲୁ ରହେ" "ଆପଣଙ୍କ ଡିଭାଇସ ଏୟାରପ୍ଲେନ ମୋଡରେ ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥକୁ ଚାଲୁ ରଖିବା ପାଇଁ ମନେ ରଖେ। ଯଦି ଆପଣ ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥ ଚାଲୁ ରହୁ ବୋଲି ଚାହୁଁନାହାଁନ୍ତି ତେବେ ସେଗୁଡ଼ିକୁ ବନ୍ଦ କରନ୍ତୁ।" + + + + + + + + diff --git a/android/app/res/values-pa/strings.xml b/android/app/res/values-pa/strings.xml index 9de8f2c5de..b00a405210 100644 --- a/android/app/res/values-pa/strings.xml +++ b/android/app/res/values-pa/strings.xml @@ -135,4 +135,12 @@ "ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਰੱਖਣਾ ਯਾਦ ਰੱਖਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਸਨੂੰ ਚਾਲੂ ਨਹੀਂ ਰੱਖਣਾ ਚਾਹੁੰਦੇ, ਤਾਂ ਬਲੂਟੁੱਥ ਨੂੰ ਬੰਦ ਕਰੋ।" "ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਚਾਲੂ ਰਹਿੰਦੇ ਹਨ" "ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਰੱਖਣਾ ਯਾਦ ਰੱਖਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਨ੍ਹਾਂ ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਰੱਖਣਾ ਚਾਹੁੰਦੇ, ਤਾਂ ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਬੰਦ ਕਰੋ।" + + + + + + + + diff --git a/android/app/res/values-pl/strings.xml b/android/app/res/values-pl/strings.xml index 0a13478c42..058ae68ca2 100644 --- a/android/app/res/values-pl/strings.xml +++ b/android/app/res/values-pl/strings.xml @@ -135,4 +135,12 @@ "Bluetooth na urządzeniu pozostaje włączony w trybie samolotowym. Wyłącz Bluetooth, jeśli nie chcesz, żeby pozostawał włączony." "Wi-Fi i Bluetooth pozostają włączone" "Wi-Fi i Bluetooth na urządzeniu pozostają włączone w trybie samolotowym. Wyłącz Wi-Fi i Bluetooth, jeśli nie chcesz, żeby funkcje te pozostawały włączone." + + + + + + + + diff --git a/android/app/res/values-pt-rPT/strings.xml b/android/app/res/values-pt-rPT/strings.xml index 8768870eda..a7d9d696d1 100644 --- a/android/app/res/values-pt-rPT/strings.xml +++ b/android/app/res/values-pt-rPT/strings.xml @@ -135,4 +135,8 @@ "O seu dispositivo lembra-se de manter o Bluetooth ativado no modo de avião. Desative o Bluetooth se não quiser que fique ativado." "O Wi-Fi e o Bluetooth mantêm-se ativados" "O seu dispositivo lembra-se de manter o Wi-Fi e o Bluetooth ativados no modo de avião. Desative o Wi-Fi e o Bluetooth se não quiser que fiquem ativados." + "O Bluetooth foi ativado automaticamente" + "O reinício automático pode ser ativado/desativado nas definições de Bluetooth." + "Desativar" + "Alteração de estado automática do Bluetooth" diff --git a/android/app/res/values-pt/strings.xml b/android/app/res/values-pt/strings.xml index 4d7c2cb8fe..6a25590df5 100644 --- a/android/app/res/values-pt/strings.xml +++ b/android/app/res/values-pt/strings.xml @@ -135,4 +135,12 @@ "O dispositivo vai manter o Bluetooth ativado no modo avião. Ele poderá ser desativado manualmente se você preferir." "O Wi-Fi e o Bluetooth ficam ativados" "O dispositivo vai manter o Wi-Fi e o Bluetooth ativados no modo avião. Eles podem ser desativados manualmente se você preferir." + + + + + + + + diff --git a/android/app/res/values-ro/strings.xml b/android/app/res/values-ro/strings.xml index 3b3aa67476..d1c7ead954 100644 --- a/android/app/res/values-ro/strings.xml +++ b/android/app/res/values-ro/strings.xml @@ -135,4 +135,12 @@ "Dispozitivul reține să păstreze Bluetooth activat în modul Avion. Dezactivează Bluetooth dacă nu vrei să rămână activat." "Wi-Fi și Bluetooth rămân activate" "Dispozitivul reține să păstreze funcțiile Wi-Fi și Bluetooth activate în modul Avion. Dezactivează Wi-Fi și Bluetooth dacă nu vrei să rămână activate." + + + + + + + + diff --git a/android/app/res/values-ru/strings.xml b/android/app/res/values-ru/strings.xml index fa5f5d9cd9..8c983c505d 100644 --- a/android/app/res/values-ru/strings.xml +++ b/android/app/res/values-ru/strings.xml @@ -135,4 +135,12 @@ "Функция Bluetooth останется включенной в режиме полета. Вы можете отключить ее, если хотите." "Функции Wi‑Fi и Bluetooth остаются включенными" "Wi‑Fi и Bluetooth останутся включенными в режиме полета. Вы можете отключить их, если хотите." + + + + + + + + diff --git a/android/app/res/values-si/strings.xml b/android/app/res/values-si/strings.xml index 3221011e3e..4366a2ec95 100644 --- a/android/app/res/values-si/strings.xml +++ b/android/app/res/values-si/strings.xml @@ -135,4 +135,12 @@ "ඔබේ උපාංගයට අහස්යානා ආකාරයේ බ්ලූටූත් ක්‍රියාත්මකව තබා ගැනීමට මතකයි. ඔබට බ්ලූටූත් ක්‍රියාත්මක වීමට අවශ්‍ය නොවේ නම් එය ක්‍රියාවිරහිත කරන්න." "Wi-Fi සහ බ්ලූටූත් ක්‍රියාත්මකව පවතී" "ඔබේ උපාංගයට අහස්යානා ආකාරයේ Wi-Fi සහ බ්ලූටූත් ක්‍රියාත්මකව තබා ගැනීමට මතකයි. Wi-Fi සහ බ්ලූටූත් ඒවා ක්‍රියාත්මක වීමට ඔබට අවශ්‍ය නැතිනම් ක්‍රියා විරහිත කරන්න." + + + + + + + + diff --git a/android/app/res/values-sk/strings.xml b/android/app/res/values-sk/strings.xml index 9d434619fb..fd007b4954 100644 --- a/android/app/res/values-sk/strings.xml +++ b/android/app/res/values-sk/strings.xml @@ -135,4 +135,12 @@ "Zariadenie si pamätá, aby v režime v lietadle nevypínalo rozhranie Bluetooth. Ak ho nechcete ponechať zapnuté, vypnite ho." "Wi‑Fi a Bluetooth zostanú zapnuté" "Zariadenie si pamätá, aby v režime v lietadle nevypínalo Wi‑Fi ani Bluetooth. Ak ich nechcete ponechať zapnuté, vypnite ich." + + + + + + + + diff --git a/android/app/res/values-sl/strings.xml b/android/app/res/values-sl/strings.xml index 8fbcfcaae5..c67abc5acb 100644 --- a/android/app/res/values-sl/strings.xml +++ b/android/app/res/values-sl/strings.xml @@ -135,4 +135,8 @@ "Naprava v načinu za letalo pusti Bluetooth vklopljen. Če ne želite, da Bluetooth ostane vklopljen, ga izklopite." "Wi-Fi in Bluetooth ostaneta vklopljena" "Naprava v načinu za letalo pusti Wi-Fi in Bluetooth vklopljena. Če ne želite, da Wi-Fi in Bluetooth ostaneta vklopljena, ju izklopite." + "Bluetooth je bil samodejno omogočen" + "Samodejni zagon lahko preklopite v nastavitvah za Bluetooth." + "Izklopi" + "Samodejna sprememba stanja Bluetootha" diff --git a/android/app/res/values-sq/strings.xml b/android/app/res/values-sq/strings.xml index 429884ad61..07374fc3eb 100644 --- a/android/app/res/values-sq/strings.xml +++ b/android/app/res/values-sq/strings.xml @@ -135,4 +135,12 @@ "Pajisja jote kujtohet që ta mbajë Bluetooth-in të aktivizuar në modalitetin e aeroplanit. Çaktivizo Bluetooth-in nëse nuk dëshiron që të qëndrojë i aktivizuar." "Wi-Fi dhe Bluetooth-i qëndrojnë aktivë" "Pajisja jote kujtohet që ta mbajë Wi-Fi dhe Bluetooth-in të aktivizuar në modalitetin e aeroplanit. Çaktivizo Wi-Fi dhe Bluetooth-in nëse nuk dëshiron që të qëndrojnë aktivë." + + + + + + + + diff --git a/android/app/res/values-sr/strings.xml b/android/app/res/values-sr/strings.xml index 27f0f9b82f..5a82f8b376 100644 --- a/android/app/res/values-sr/strings.xml +++ b/android/app/res/values-sr/strings.xml @@ -135,4 +135,12 @@ "Уређај памти да не треба да искључује Bluetooth у режиму рада у авиону. Искључите Bluetooth ако не желите да остане укључен." "WiFi и Bluetooth остају укључени" "Уређај памти да не треба да искључује WiFi и Bluetooth у режиму рада у авиону. Искључите WiFi и Bluetooth ако не желите да остану укључени." + + + + + + + + diff --git a/android/app/res/values-sv/strings.xml b/android/app/res/values-sv/strings.xml index 07f3b9e7d8..6d178be8f7 100644 --- a/android/app/res/values-sv/strings.xml +++ b/android/app/res/values-sv/strings.xml @@ -135,4 +135,12 @@ "Enheten kommer ihåg att hålla Bluetooth aktiverat i flygplansläge. Inaktivera Bluetooth om du inte vill att det ska hållas aktiverat." "Wifi och Bluetooth ska vara aktiverade" "Enheten kommer ihåg att hålla wifi och Bluetooth aktiverade i flygplansläge. Du kan inaktivera wifi och Bluetooth om du inte vill hålla dem aktiverade." + + + + + + + + diff --git a/android/app/res/values-sw/strings.xml b/android/app/res/values-sw/strings.xml index 077674ec95..6311017679 100644 --- a/android/app/res/values-sw/strings.xml +++ b/android/app/res/values-sw/strings.xml @@ -135,4 +135,8 @@ "Kifaa chako kitaendelea kuwasha Bluetooth katika hali ya ndegeni. Zima Bluetooth iwapo hutaki iendelee kuwaka." "Wi-Fi na Bluetooth zitaendelea kuwaka" "Kifaa chako kitaendelea kuwasha Wi-Fi na Bluetooth ukiwa katika hali ya ndegeni. Zima Wi-Fi na Bluetooth ikiwa hutaki ziendelee kuwaka." + "Bluetooth imewashwa kiotomatiki" + "Unaweza kuwasha au kuzima kipengele cha zima kisha uwashe kiotomatiki katika Mipangilio ya Bluetooth." + "Zima" + "Mabadiliko ya kiotomatiki kwenye hali ya Bluetooth" diff --git a/android/app/res/values-ta/strings.xml b/android/app/res/values-ta/strings.xml index 137ec5c408..1e23b0daa0 100644 --- a/android/app/res/values-ta/strings.xml +++ b/android/app/res/values-ta/strings.xml @@ -135,4 +135,12 @@ "உங்கள் சாதனம் விமானப் பயன்முறையில் புளூடூத்தை இயக்கத்திலேயே வைத்திருக்கும். புளூடூத்தை இயக்கத்தில் வைத்திருக்க விரும்பவில்லை எனில் நீங்கள் அதை முடக்கலாம்." "வைஃபையும் புளூடூத்தும் இயக்கத்திலேயே இருத்தல்" "உங்கள் சாதனம் விமானப் பயன்முறையில் வைஃபையையும் புளூடூத்தையும் இயக்கத்திலேயே வைத்திருக்கும். வைஃபையையும் புளூடூத்தையும் இயக்கத்தில் வைத்திருக்க விரும்பவில்லை எனில் நீங்கள் அவற்றை முடக்கலாம்." + + + + + + + + diff --git a/android/app/res/values-te/strings.xml b/android/app/res/values-te/strings.xml index b0de0b5c1b..1be831cc42 100644 --- a/android/app/res/values-te/strings.xml +++ b/android/app/res/values-te/strings.xml @@ -135,4 +135,8 @@ "విమానం మోడ్‌లో బ్లూటూత్ ఆన్‌లో ఉంచాలని మీ పరికరం గుర్తుంచుకుంటుంది. బ్లూటూత్ ఆన్‌లో ఉండకూడదనుకుంటే దాన్ని ఆఫ్ చేయండి." "Wi-Fi, బ్లూటూత్ ఆన్‌లో ఉంటాయి" "మీ పరికరం విమానం మోడ్‌లో Wi‑Fiని, బ్లూటూత్‌ను ఆన్‌లో ఉంచాలని గుర్తుంచుకుంటుంది. Wi-Fi, బ్లూటూత్ ఆన్‌లో ఉండకూడదనుకుంటే వాటిని ఆఫ్ చేయండి." + "బ్లూటూత్ ఆటోమేటిక్‌గా ఎనేబుల్ చేయబడింది" + "బ్లూటూత్ సెట్టింగ్‌లలో ఆటోమేటిక్ రీస్టార్ట్ బటన్‌ను టోగుల్ చేయవచ్చు." + "ఆఫ్ చేయండి" + "బ్లూటూత్ ఆటోమేటిక్ స్థితి మార్పు" diff --git a/android/app/res/values-th/strings.xml b/android/app/res/values-th/strings.xml index c4cf4a42c8..cbc8dd0aa7 100644 --- a/android/app/res/values-th/strings.xml +++ b/android/app/res/values-th/strings.xml @@ -135,4 +135,8 @@ "อุปกรณ์จำว่าจะต้องเปิดบลูทูธไว้ในโหมดบนเครื่องบิน ปิดบลูทูธหากคุณไม่ต้องการให้เปิดไว้" "Wi-Fi และบลูทูธยังเปิดอยู่" "อุปกรณ์จำว่าจะต้องเปิด Wi-Fi และบลูทูธไว้ในโหมดบนเครื่องบิน ปิด Wi-Fi และบลูทูธหากคุณไม่ต้องการให้เปิดไว้" + "เปิดใช้บลูทูธโดยอัตโนมัติแล้ว" + "เปิด/ปิดการรีสตาร์ทอัตโนมัติได้ในการตั้งค่าบลูทูธ" + "ปิด" + "การเปลี่ยนสถานะ \"อัตโนมัติ\" ของบลูทูธ" diff --git a/android/app/res/values-tl/strings.xml b/android/app/res/values-tl/strings.xml index ab10130515..18d81ffda4 100644 --- a/android/app/res/values-tl/strings.xml +++ b/android/app/res/values-tl/strings.xml @@ -135,4 +135,8 @@ "Tinatandaan ng iyong device na panatilihing naka-on ang Bluetooth habang nasa airplane mode. I-off ang Bluetooth kung ayaw mo itong manatiling naka-on." "Mananatiling naka-on ang Wi-Fi at Bluetooth" "Tinatandaan ng iyong device na panatilihing naka-on ang Wi-Fi at Bluetooth habang nasa airplane mode. I-off ang Wi-Fi at Bluetooth kung ayaw mong manatiling naka-on ang mga ito." + "Awtomatikong na-enable ang Bluetooth" + "Puwedeng i-toggle ang awtomatikong pag-restart sa Mga Setting ng Bluetooth." + "I-off" + "Awtomatikong pagbago sa status ng Bluetooth" diff --git a/android/app/res/values-tr/strings.xml b/android/app/res/values-tr/strings.xml index cc35f66b8d..24d23bbe8f 100644 --- a/android/app/res/values-tr/strings.xml +++ b/android/app/res/values-tr/strings.xml @@ -135,4 +135,12 @@ "Cihazınız, uçak modundayken Bluetooth\'u açık tutmayı hatırlar. Açık kalmasını istemiyorsanız Bluetooth\'u kapatın." "Kablosuz bağlantı ve Bluetooth açık kalır" "Cihazınız, uçak modundayken kablosuz bağlantıyı ve Bluetooth\'u açık tutmayı hatırlar. Açık kalmasını istemiyorsanız kablosuz bağlantıyı ve Bluetooth\'u kapatın." + + + + + + + + diff --git a/android/app/res/values-uk/strings.xml b/android/app/res/values-uk/strings.xml index 96901555d2..07d95eca42 100644 --- a/android/app/res/values-uk/strings.xml +++ b/android/app/res/values-uk/strings.xml @@ -135,4 +135,12 @@ "У режимі польоту функція Bluetooth на пристрої залишатиметься ввімкненою. За бажання її можна вимкнути." "Wi-Fi і Bluetooth залишаються ввімкненими" "У режимі польоту функції Wi-Fi і Bluetooth на пристрої залишатимуться ввімкненими. За бажання їх можна вимкнути." + + + + + + + + diff --git a/android/app/res/values-ur/strings.xml b/android/app/res/values-ur/strings.xml index 9602e202ae..d0ad0a58ec 100644 --- a/android/app/res/values-ur/strings.xml +++ b/android/app/res/values-ur/strings.xml @@ -135,4 +135,8 @@ "آپ کا آلہ ہوائی جہاز وضع میں بلوٹوتھ کو آن رکھنا یاد رکھتا ہے۔ اگر آپ نہیں چاہتے ہیں کہ بلوٹوتھ آن رہے تو اسے آف کریں۔" "‏Wi-Fi اور بلوٹوتھ آن رہنے دیں" "‏آپ کا آلہ ہوائی جہاز وضع میں Wi-Fi اور بلوٹوتھ کو آن رکھنا یاد رکھتا ہے۔ اگر آپ نہیں چاہتے ہیں کہ Wi-Fi اور بلوٹوتھ آن رہیں تو انہیں آف کریں۔" + "بلوٹوتھ خودکار طور پر فعال ہو گیا ہے" + "خودکار ری اسٹارٹ کو بلوٹوتھ ترتیبات میں ٹوگل کیا جا سکتا ہے۔" + "آف کریں" + "بلوٹوتھ خودکار حالت میں تبدیلی" diff --git a/android/app/res/values-uz/strings.xml b/android/app/res/values-uz/strings.xml index de0031674f..a85718cc32 100644 --- a/android/app/res/values-uz/strings.xml +++ b/android/app/res/values-uz/strings.xml @@ -135,4 +135,12 @@ "Qurilmangiz parvoz rejimida Bluetooth yoqilganini eslab qoladi. Yoniq qolmasligi uchun Bluetooth aloqasini oʻchiring." "Wi-Fi va Bluetooth yoniq qoladi" "Qurilmangiz parvoz rejimida Wi‑Fi va Bluetooth yoqilganini eslab qoladi. Yoniq qolmasligi uchun Wi-Fi va Bluetooth aloqasini oʻchiring." + + + + + + + + diff --git a/android/app/res/values-vi/strings.xml b/android/app/res/values-vi/strings.xml index be5235ec4b..eed845b7f6 100644 --- a/android/app/res/values-vi/strings.xml +++ b/android/app/res/values-vi/strings.xml @@ -135,4 +135,12 @@ "Thiết bị của bạn sẽ luôn bật Bluetooth ở chế độ trên máy bay. Nếu không muốn như vậy thì bạn có thể tắt Bluetooth." "Wi-Fi và Bluetooth vẫn đang bật" "Thiết bị của bạn sẽ luôn bật Wi-Fi và Bluetooth ở chế độ trên máy bay. Nếu không muốn như vậy thì bạn có thể tắt Wi-Fi và Bluetooth." + + + + + + + + diff --git a/android/app/res/values-zh-rCN/strings.xml b/android/app/res/values-zh-rCN/strings.xml index 14b3070802..041101f028 100644 --- a/android/app/res/values-zh-rCN/strings.xml +++ b/android/app/res/values-zh-rCN/strings.xml @@ -135,4 +135,12 @@ "在飞行模式下设备将记住保持开启蓝牙。如果您不想保持开启和蓝牙，请关闭蓝牙。" "WLAN 和蓝牙保持开启状态" "在飞行模式下设备将记住保持开启 WLAN 和蓝牙。如果您不想保持开启 WLAN 和蓝牙，请关闭 WLAN 和蓝牙。" + + + + + + + + diff --git a/android/app/res/values-zh-rHK/strings.xml b/android/app/res/values-zh-rHK/strings.xml index 6eae82bb31..a805eb5e00 100644 --- a/android/app/res/values-zh-rHK/strings.xml +++ b/android/app/res/values-zh-rHK/strings.xml @@ -135,4 +135,12 @@ "裝置會記得在飛行模式下保持藍牙開啟。如果你不希望保持開啟，請關閉藍牙。" "Wi-Fi 和藍牙保持開啟" "裝置會記得在飛行模式下保持 Wi-Fi 及藍牙開啟。如果你不希望保持開啟，請關閉 Wi-Fi 及藍牙。" + + + + + + + + diff --git a/android/app/res/values-zh-rTW/strings.xml b/android/app/res/values-zh-rTW/strings.xml index 97ee53f362..11b3d30680 100644 --- a/android/app/res/values-zh-rTW/strings.xml +++ b/android/app/res/values-zh-rTW/strings.xml @@ -135,4 +135,12 @@ "裝置會記得在飛航模式下讓藍牙保持開啟狀態。如果不要保持開啟狀態，請關閉藍牙。" "Wi-Fi 和藍牙會保持開啟狀態" "裝置會記得在飛航模式下讓 Wi-Fi 和藍牙保持開啟狀態。如果不要保持開啟狀態，請關閉 Wi-Fi 和藍牙。" + + + + + + + + diff --git a/android/app/res/values-zu/strings.xml b/android/app/res/values-zu/strings.xml index 66b31ae95e..56f61627ee 100644 --- a/android/app/res/values-zu/strings.xml +++ b/android/app/res/values-zu/strings.xml @@ -135,4 +135,12 @@ "Idivayisi yakho ikhumbula ukugcina i-Bluetooth ivuliwe kumodi yendiza. Vala i-Bluetooth uma ungafuni ukuthi ihlale ivuliwe." "I-Wi-Fi ne-Bluetooth kuhlala kuvuliwe" "Ifoni yakho ikhumbula ukugcina i-Wi-Fi ne-Bluetooth kuvuliwe kumodi yendiza. Vala i-Wi-Fi ne-Bluetooth uma ungafuni ukuthi ihlale ivuliwe." + + + + + + + + -- cgit v1.2.3-59-g8ed1b From c4686e353759c29f56e7a551a9d14f6f6aa47ab1 Mon Sep 17 00:00:00 2001 From: Henri Chataing Date: Thu, 15 Feb 2024 20:02:39 +0000 Subject: system/stack/smp: Conflict resolution for libbluetooth_log migration Ignore-AOSP-First: Conflict resolution Test: m com.android.btservices Bug: 305066880 Flag: EXEMPT, mechanical refactor Change-Id: I4ca5347484639e2d7a499f4a0b7ab7de6d0cee63 --- system/stack/Android.bp | 1 + system/stack/smp/smp_act.cc | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/system/stack/Android.bp b/system/stack/Android.bp index aef3d0bd7a..a983ad0287 100644 --- a/system/stack/Android.bp +++ b/system/stack/Android.bp @@ -893,6 +893,7 @@ cc_test { "server_configurable_flags", ], static_libs: [ + "libbase", "libbluetooth-types", "libbluetooth_crypto_toolbox", "libbluetooth_gd", diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc index e8bc801631..2bae4a33e3 100644 --- a/system/stack/smp/smp_act.cc +++ b/system/stack/smp/smp_act.cc @@ -19,6 +19,7 @@ #define LOG_TAG "smp_act" #include +#include #include @@ -41,6 +42,8 @@ #include "stack/include/smp_api_types.h" #include "types/raw_address.h" +using namespace bluetooth; + namespace { constexpr char kBtmLogTag[] = "SMP"; } @@ -1972,7 +1975,7 @@ void smp_process_secure_connection_oob_data(tSMP_CB* p_cb, } if (!p_sc_oob_data->peer_oob_data.present) { - LOG_VERBOSE("peer OOB data is absent"); + log::verbose("peer OOB data is absent"); if (IS_FLAG_ENABLED(fix_le_oob_pairing_bypass)) { tSMP_INT_DATA smp_int_data{}; -- cgit v1.2.3-59-g8ed1b From 0a1472fd9a515d53fc72589953c679f7322b97df Mon Sep 17 00:00:00 2001 From: Henri Chataing Date: Thu, 15 Feb 2024 22:57:24 +0000 Subject: system/stack/srvc: Migrate to libbluetooth_log Ignore-AOSP-First: Merge conflict Test: m com.android.btservices Bug: 305066880 Flag: EXEMPT, mechanical refactor Change-Id: Iacc9d5338d1e688e02f932947e7034038cf7289f --- system/stack/srvc/srvc_dis.cc | 35 +++++++++++++++++------------------ system/stack/srvc/srvc_eng.cc | 31 ++++++++++++++++--------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/system/stack/srvc/srvc_dis.cc b/system/stack/srvc/srvc_dis.cc index 16a3d60c06..fe4f2bc26c 100644 --- a/system/stack/srvc/srvc_dis.cc +++ b/system/stack/srvc/srvc_dis.cc @@ -19,6 +19,7 @@ #define LOG_TAG "bt_srvc" #include +#include #include "gatt_api.h" #include "hardware/bt_gatt_types.h" @@ -33,6 +34,8 @@ #include "types/raw_address.h" using base::StringPrintf; +using namespace bluetooth; + #define DIS_MAX_NUM_INC_SVR 0 #define DIS_MAX_CHAR_NUM 9 #define DIS_MAX_ATTR_NUM (DIS_MAX_CHAR_NUM * 2 + DIS_MAX_NUM_INC_SVR + 1) @@ -160,8 +163,7 @@ uint8_t dis_read_attr_value(UNUSED_ATTR uint8_t clcb_idx, uint16_t handle, p_value->len -= offset; pp += offset; ARRAY_TO_STREAM(p, pp, p_value->len); - VLOG(1) << "GATT_UUID_MANU_NAME len=0x" << std::hex - << +p_value->len; + log::verbose("GATT_UUID_MANU_NAME len=0x{:x}", p_value->len); } break; @@ -202,8 +204,8 @@ static void dis_gatt_c_read_dis_value_cmpl(uint16_t conn_id) { srvc_eng_release_channel(conn_id); if (dis_cb.p_read_dis_cback && p_clcb) { - LOG_INFO("%s conn_id:%d attr_mask = 0x%04x", __func__, conn_id, - p_clcb->dis_value.attr_mask); + log::info("conn_id:{} attr_mask = 0x{:04x}", conn_id, + p_clcb->dis_value.attr_mask); (*dis_cb.p_read_dis_cback)(p_clcb->bda, &p_clcb->dis_value); dis_cb.p_read_dis_cback = NULL; @@ -237,8 +239,7 @@ bool dis_gatt_c_read_dis_req(uint16_t conn_id) { if (GATTC_Read(conn_id, GATT_READ_BY_TYPE, ¶m) == GATT_SUCCESS) return true; - LOG(ERROR) << "Read DISInfo: " << param.service.uuid - << " GATT_Read Failed"; + log::error("Read DISInfo: {} GATT_Read Failed", param.service.uuid); } dis_cb.dis_read_uuid_idx++; @@ -271,9 +272,8 @@ void dis_c_cmpl_cback(tSRVC_CLCB* p_clcb, tGATTC_OPTYPE op, tGATT_STATUS status, read_type = dis_attr_uuid[dis_cb.dis_read_uuid_idx]; - VLOG(1) << __func__ - << StringPrintf("op_code: 0x%02x status: 0x%02x read_type: 0x%04x", - op, status, read_type); + log::verbose("op_code: 0x{:02x} status: 0x{:02x} read_type: 0x{:04x}", op, + status, read_type); if (op != GATTC_OPTYPE_READ) return; @@ -282,7 +282,7 @@ void dis_c_cmpl_cback(tSRVC_CLCB* p_clcb, tGATTC_OPTYPE op, tGATT_STATUS status, switch (read_type) { case GATT_UUID_SYSTEM_ID: - VLOG(1) << "DIS_ATTR_SYS_ID_BIT"; + log::verbose("DIS_ATTR_SYS_ID_BIT"); if (p_data->att_value.len == DIS_SYSTEM_ID_SIZE) { p_clcb->dis_value.attr_mask |= DIS_ATTR_SYS_ID_BIT; /* save system ID*/ @@ -341,7 +341,7 @@ tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask) { tGATT_STATUS status; if (dis_cb.enabled) { - LOG(ERROR) << "DIS already initalized"; + log::error("DIS already initalized"); return DIS_SUCCESS; } @@ -372,7 +372,7 @@ tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask) { status = GATTS_AddService(srvc_eng_cb.gatt_if, service, sizeof(service) / sizeof(btgatt_db_element_t)); if (status != GATT_SERVICE_STARTED) { - LOG(ERROR) << "Can not create service, DIS_Init failed!"; + log::error("Can not create service, DIS_Init failed!"); return GATT_ERROR; } @@ -382,9 +382,8 @@ tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask) { for (int i = 0; i < DIS_MAX_CHAR_NUM; i++) { dis_cb.dis_attr[i].handle = service[i + 1].attribute_handle; - VLOG(1) << StringPrintf("%s: handle of new attribute 0x%04x = %d", - __func__, dis_cb.dis_attr[i].uuid, - dis_cb.dis_attr[i].handle); + log::verbose("handle of new attribute 0x{:04x} = {}", + dis_cb.dis_attr[i].uuid, dis_cb.dis_attr[i].handle); } dis_cb.enabled = true; @@ -456,9 +455,9 @@ bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback, dis_cb.request_mask = mask; - VLOG(1) << __func__ << " BDA: " << ADDRESS_TO_LOGGABLE_STR(peer_bda) - << StringPrintf(" cl_read_uuid: 0x%04x", - dis_attr_uuid[dis_cb.dis_read_uuid_idx]); + log::verbose("BDA: {} cl_read_uuid: 0x{:04x}", + ADDRESS_TO_LOGGABLE_STR(peer_bda), + dis_attr_uuid[dis_cb.dis_read_uuid_idx]); if (!GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, peer_bda, &conn_id, BT_TRANSPORT_LE)) { diff --git a/system/stack/srvc/srvc_eng.cc b/system/stack/srvc/srvc_eng.cc index 10cb2b4ded..cc2f1cb295 100644 --- a/system/stack/srvc/srvc_eng.cc +++ b/system/stack/srvc/srvc_eng.cc @@ -17,6 +17,7 @@ ******************************************************************************/ #include +#include #include "gatt_api.h" #include "os/logging/log_adapter.h" @@ -29,6 +30,8 @@ #include "types/raw_address.h" using base::StringPrintf; +using namespace bluetooth; + static void srvc_eng_s_request_cback(uint16_t conn_id, uint32_t trans_id, tGATTS_REQ_TYPE type, tGATTS_DATA* p_data); static void srvc_eng_connect_cback(UNUSED_ATTR tGATT_IF gatt_if, @@ -237,8 +240,7 @@ static void srvc_eng_s_request_cback(uint16_t conn_id, uint32_t trans_id, uint8_t act = SRVC_ACT_IGNORE; uint8_t clcb_idx = srvc_eng_find_clcb_idx_by_conn_id(conn_id); - VLOG(1) << StringPrintf("srvc_eng_s_request_cback : recv type (0x%02x)", - type); + log::verbose("srvc_eng_s_request_cback : recv type (0x{:02x})", type); memset(&rsp_msg, 0, sizeof(tGATTS_RSP)); @@ -259,16 +261,15 @@ static void srvc_eng_s_request_cback(uint16_t conn_id, uint32_t trans_id, break; case GATTS_REQ_TYPE_WRITE_EXEC: - VLOG(1) << "Ignore GATT_REQ_EXEC_WRITE/WRITE_CMD"; + log::verbose("Ignore GATT_REQ_EXEC_WRITE/WRITE_CMD"); break; case GATTS_REQ_TYPE_MTU: - VLOG(1) << "Get MTU exchange new mtu size: " << p_data->mtu; + log::verbose("Get MTU exchange new mtu size: {}", p_data->mtu); break; default: - VLOG(1) << StringPrintf("Unknown/unexpected LE GAP ATT request: 0x%02x", - type); + log::verbose("Unknown/unexpected LE GAP ATT request: 0x{:02x}", type); break; } @@ -291,11 +292,11 @@ static void srvc_eng_c_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op, tGATT_CL_COMPLETE* p_data) { tSRVC_CLCB* p_clcb = srvc_eng_find_clcb_by_conn_id(conn_id); - VLOG(1) << StringPrintf( - "srvc_eng_c_cmpl_cback() - op_code: 0x%02x status: 0x%02x ", op, status); + log::verbose("srvc_eng_c_cmpl_cback() - op_code: 0x{:02x} status: 0x{:02x}", + op, status); if (p_clcb == NULL) { - LOG(ERROR) << __func__ << " received for unknown connection"; + log::error("received for unknown connection"); return; } @@ -316,12 +317,12 @@ static void srvc_eng_connect_cback(UNUSED_ATTR tGATT_IF gatt_if, const RawAddress& bda, uint16_t conn_id, bool connected, tGATT_DISCONN_REASON reason, UNUSED_ATTR tBT_TRANSPORT transport) { - VLOG(1) << __func__ << ": from " << ADDRESS_TO_LOGGABLE_STR(bda) - << StringPrintf(" connected:%d conn_id=%d", connected, conn_id); + log::verbose("from {} connected:{} conn_id={}", ADDRESS_TO_LOGGABLE_STR(bda), + connected, conn_id); if (connected) { if (srvc_eng_clcb_alloc(conn_id, bda) == NULL) { - LOG(ERROR) << __func__ << "srvc_eng_connect_cback: no_resource"; + log::error("srvc_eng_connect_cback: no_resource"); return; } } else { @@ -363,7 +364,7 @@ void srvc_eng_release_channel(uint16_t conn_id) { tSRVC_CLCB* p_clcb = srvc_eng_find_clcb_by_conn_id(conn_id); if (p_clcb == NULL) { - LOG(ERROR) << __func__ << ": invalid connection id " << conn_id; + log::error("invalid connection id {}", conn_id); return; } @@ -382,7 +383,7 @@ void srvc_eng_release_channel(uint16_t conn_id) { tGATT_STATUS srvc_eng_init(void) { if (srvc_eng_cb.enabled) { - LOG(ERROR) << "DIS already initalized"; + log::error("DIS already initalized"); } else { memset(&srvc_eng_cb, 0, sizeof(tSRVC_ENG_CB)); @@ -393,7 +394,7 @@ tGATT_STATUS srvc_eng_init(void) { GATT_Register(app_uuid, "GattServiceEngine", &srvc_gatt_cback, false); GATT_StartIf(srvc_eng_cb.gatt_if); - VLOG(1) << "Srvc_Init: gatt_if=" << +srvc_eng_cb.gatt_if; + log::verbose("Srvc_Init: gatt_if={}", srvc_eng_cb.gatt_if); srvc_eng_cb.enabled = true; dis_cb.dis_read_uuid_idx = 0xff; -- cgit v1.2.3-59-g8ed1b From a807718fe26acc470fab0c6507c08c3a43dec5b5 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 21 Feb 2024 18:32:00 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I1743c965718418563700b94bca938980e2c71e79 --- android/app/res/values-af/strings.xml | 12 ++++-------- android/app/res/values-ar/strings.xml | 12 ++++-------- android/app/res/values-b+sr+Latn/strings.xml | 12 ++++-------- android/app/res/values-be/strings.xml | 12 ++++-------- android/app/res/values-bg/strings.xml | 12 ++++-------- android/app/res/values-bn/strings.xml | 12 ++++-------- android/app/res/values-bs/strings.xml | 2 +- android/app/res/values-cs/strings.xml | 12 ++++-------- android/app/res/values-da/strings.xml | 12 ++++-------- android/app/res/values-de/strings.xml | 12 ++++-------- android/app/res/values-en-rAU/strings.xml | 12 ++++-------- android/app/res/values-en-rGB/strings.xml | 12 ++++-------- android/app/res/values-en-rIN/strings.xml | 12 ++++-------- android/app/res/values-es-rUS/strings.xml | 12 ++++-------- android/app/res/values-eu/strings.xml | 12 ++++-------- android/app/res/values-fa/strings.xml | 12 ++++-------- android/app/res/values-fi/strings.xml | 12 ++++-------- android/app/res/values-fr-rCA/strings.xml | 12 ++++-------- android/app/res/values-gl/strings.xml | 12 ++++-------- android/app/res/values-gu/strings.xml | 12 ++++-------- android/app/res/values-hi/strings.xml | 12 ++++-------- android/app/res/values-hu/strings.xml | 12 ++++-------- android/app/res/values-hy/strings.xml | 12 ++++-------- android/app/res/values-in/strings.xml | 12 ++++-------- android/app/res/values-is/strings.xml | 12 ++++-------- android/app/res/values-iw/strings.xml | 12 ++++-------- android/app/res/values-kk/strings.xml | 12 ++++-------- android/app/res/values-kn/strings.xml | 12 ++++-------- android/app/res/values-ko/strings.xml | 12 ++++-------- android/app/res/values-ky/strings.xml | 12 ++++-------- android/app/res/values-lt/strings.xml | 12 ++++-------- android/app/res/values-lv/strings.xml | 12 ++++-------- android/app/res/values-mk/strings.xml | 12 ++++-------- android/app/res/values-mn/strings.xml | 12 ++++-------- android/app/res/values-my/strings.xml | 12 ++++-------- android/app/res/values-nb/strings.xml | 12 ++++-------- android/app/res/values-or/strings.xml | 12 ++++-------- android/app/res/values-pa/strings.xml | 12 ++++-------- android/app/res/values-pl/strings.xml | 12 ++++-------- android/app/res/values-pt/strings.xml | 12 ++++-------- android/app/res/values-ro/strings.xml | 12 ++++-------- android/app/res/values-ru/strings.xml | 12 ++++-------- android/app/res/values-si/strings.xml | 12 ++++-------- android/app/res/values-sk/strings.xml | 12 ++++-------- android/app/res/values-sq/strings.xml | 12 ++++-------- android/app/res/values-sr/strings.xml | 12 ++++-------- android/app/res/values-sv/strings.xml | 12 ++++-------- android/app/res/values-ta/strings.xml | 12 ++++-------- android/app/res/values-tr/strings.xml | 12 ++++-------- android/app/res/values-uk/strings.xml | 12 ++++-------- android/app/res/values-uz/strings.xml | 12 ++++-------- android/app/res/values-vi/strings.xml | 12 ++++-------- android/app/res/values-zh-rCN/strings.xml | 12 ++++-------- android/app/res/values-zh-rHK/strings.xml | 12 ++++-------- android/app/res/values-zh-rTW/strings.xml | 12 ++++-------- android/app/res/values-zu/strings.xml | 12 ++++-------- 56 files changed, 221 insertions(+), 441 deletions(-) diff --git a/android/app/res/values-af/strings.xml b/android/app/res/values-af/strings.xml index 58f7916eb3..6c7a0dea70 100644 --- a/android/app/res/values-af/strings.xml +++ b/android/app/res/values-af/strings.xml @@ -135,12 +135,8 @@ "Jou toestel onthou om Bluetooth aan te hou in vliegtuigmodus. Skakel Bluetooth af as jy nie wil hê dit moet aan bly nie." "Wi-fi en Bluetooth bly aan" "Jou toestel onthou om wi‑fi en Bluetooth aan te hou in vliegtuigmodus. Skakel wi-fi en Bluetooth af as jy nie wil hê dit moet aan bly nie." - - - - - - - - + "Bluetooth is outomaties geaktiveer" + "Outomatiese herbegin kan in Bluetooth-instellings aan- en afgeskakel word." + "Skakel af" + "Outomatiese verandering in Bluetooth-status" diff --git a/android/app/res/values-ar/strings.xml b/android/app/res/values-ar/strings.xml index 1e35fedbf4..1a9243391c 100644 --- a/android/app/res/values-ar/strings.xml +++ b/android/app/res/values-ar/strings.xml @@ -135,12 +135,8 @@ "يتذكر جهازك الاحتفاظ بتقنية البلوتوث مفعَّلة في \"وضع الطيران\". يمكنك إيقاف تقنية البلوتوث إذا لم تكن تريد مواصلة تفعيلها." "‏تظل شبكة Wi‑Fi وتقنية البلوتوث مفعَّلتَين." "‏يتذكر جهازك الاحتفاظ بشبكة Wi‑Fi وتقنية البلوتوث مفعَّلتَين في \"وضع الطيران\". يمكنك إيقاف شبكة Wi‑Fi وتقنية البلوتوث إذا لم تكن تريد مواصلة تفعيلهما." - - - - - - - - + "تم تفعيل البلوتوث تلقائيًا" + "يمكن إيقاف ميزة إعادة التشغيل التلقائية أو تفعيلها من خلال إعدادات البلوتوث." + "إيقاف" + "تغيير حالة تفعيل أو إيقاف البلوتوث تلقائيًا" diff --git a/android/app/res/values-b+sr+Latn/strings.xml b/android/app/res/values-b+sr+Latn/strings.xml index fed1b5137e..35e0148a1a 100644 --- a/android/app/res/values-b+sr+Latn/strings.xml +++ b/android/app/res/values-b+sr+Latn/strings.xml @@ -135,12 +135,8 @@ "Uređaj pamti da ne treba da isključuje Bluetooth u režimu rada u avionu. Isključite Bluetooth ako ne želite da ostane uključen." "WiFi i Bluetooth ostaju uključeni" "Uređaj pamti da ne treba da isključuje WiFi i Bluetooth u režimu rada u avionu. Isključite WiFi i Bluetooth ako ne želite da ostanu uključeni." - - - - - - - - + "Bluetooth je automatski omogućen" + "Automatski restart može da se uključi ili isključi u podešavanjima Bluetooth-a." + "Isključi" + "Automatski status Bluetooth-a je promenjen" diff --git a/android/app/res/values-be/strings.xml b/android/app/res/values-be/strings.xml index 24f46fa237..529ad0f36f 100644 --- a/android/app/res/values-be/strings.xml +++ b/android/app/res/values-be/strings.xml @@ -135,12 +135,8 @@ "На прыладзе ў рэжыме палёту Bluetooth застанецца ўключаным, але вы можаце выключыць яго." "Wi-Fi і Bluetooth застаюцца ўключанымі" "На прыладзе ў рэжыме палёту Wi‑Fi і Bluetooth будуць заставацца ўключанымі, але вы можаце выключыць іх." - - - - - - - - + "Bluetooth быў уключаны аўтаматычна" + "У наладах Bluetooth можна ўключыць аўтаматычны перазапуск." + "Выключыць" + "Аўтаматычнае змяненне стану Bluetooth" diff --git a/android/app/res/values-bg/strings.xml b/android/app/res/values-bg/strings.xml index c93e9659e4..e6475cd363 100644 --- a/android/app/res/values-bg/strings.xml +++ b/android/app/res/values-bg/strings.xml @@ -135,12 +135,8 @@ "Функцията за Bluetooth ще бъде включена, докато устройството ви е в самолетен режим. Ако не искате това, изключете я." "Функциите за Wi-Fi и Bluetooth няма да бъдат изключени" "Функциите за Wi‑Fi и Bluetooth ще бъдат включени, докато устройството ви е в самолетен режим. Ако не искате това, изключете ги." - - - - - - - - + "Функцията за Bluetooth е активирана автоматично" + "Автоматичното рестартиране може да се превключва от настройките за Bluetooth." + "Изключване" + "Автоматична промяна в състоянието на Bluetooth" diff --git a/android/app/res/values-bn/strings.xml b/android/app/res/values-bn/strings.xml index 589c3c6a4a..b2b418fe11 100644 --- a/android/app/res/values-bn/strings.xml +++ b/android/app/res/values-bn/strings.xml @@ -135,12 +135,8 @@ "\'বিমান মোড\'-এ থাকাকালীন আপনার ডিভাইস ব্লুটুথ চালু রাখে। আপনি ব্লুটুথ চালু না রাখতে চাইলে এটি বন্ধ করুন।" "ওয়াই-ফাই ও ব্লুটুথ চালু থাকে" "\'বিমান মোড\'-এ থাকাকালীন আপনার ডিভাইস, ওয়াই-ফাই ও ব্লুটুথ চালু রাখে। আপনি যদি ওয়াই-ফাই এবং ব্লুটুথ চালু রাখতে না চান, সেগুলি বন্ধ করে দিন।" - - - - - - - - + "ব্লুটুথ অটোমেটিক চালু হয়ে গেছে" + "ব্লুটুথ সেটিংসে অটোমেটিক রিস্টার্ট করার সুবিধা টগল করা যাবে।" + "বন্ধ করুন" + "ব্লুটুথ অটোমেটিক চালু হওয়ার সেটিং পরিবর্তন করেছে" diff --git a/android/app/res/values-bs/strings.xml b/android/app/res/values-bs/strings.xml index 722e8edb2d..11e7d08b11 100644 --- a/android/app/res/values-bs/strings.xml +++ b/android/app/res/values-bs/strings.xml @@ -136,7 +136,7 @@ "WiFi i Bluetooth ostaju uključeni" "Uređaj pamti da WiFi i Bluetooth trebaju biti uključeni u načinu rada u avionu. Isključite WiFi i Bluetooth ako ne želite da ostanu uključeni." "Bluetooth je automatski omogućen" - "Automatsko ponovno pokretanje može se uključiti u postavkama Bluetootha." + "Automatsko ponovno pokretanje se može uključiti/isključiti u Postavkama Bluetootha." "Isključi" "Automatska promjena stanja Bluetootha" diff --git a/android/app/res/values-cs/strings.xml b/android/app/res/values-cs/strings.xml index 6ba616584c..23f94a8430 100644 --- a/android/app/res/values-cs/strings.xml +++ b/android/app/res/values-cs/strings.xml @@ -135,12 +135,8 @@ "Zařízení si pamatuje, že má v režimu Letadlo ponechat zapnutý Bluetooth. Pokud nechcete, aby Bluetooth zůstal zapnutý, vypněte ho." "Wi-Fi a Bluetooth zůstávají zapnuté" "Zařízení si pamatuje, že má v režimu Letadlo ponechat zapnutou Wi-Fi a Bluetooth. Pokud nechcete, aby Wi-Fi a Bluetooth zůstaly zapnuté, vypněte je." - - - - - - - - + "Rozhraní Bluetooth bylo automaticky zapnuto" + "Automatický restart lze přepnout v Nastavení Bluetooth." + "Vypnout" + "Automatická změna stavu rozhraní Bluetooth" diff --git a/android/app/res/values-da/strings.xml b/android/app/res/values-da/strings.xml index 30648243bd..2bb6d00ecc 100644 --- a/android/app/res/values-da/strings.xml +++ b/android/app/res/values-da/strings.xml @@ -135,12 +135,8 @@ "Din enhed beholder Bluetooth aktiveret i flytilstand. Deaktiver Bluetooth, hvis du ikke vil have, at det forbliver aktiveret." "Wi-Fi og Bluetooth forbliver aktiveret" "Din enhed beholder Wi-Fi og Bluetooth aktiveret i flytilstand. Deaktiver Wi-Fi og Bluetooth, hvis du ikke vil have, at de forbliver aktiveret." - - - - - - - - + "Bluetooth er automatisk blevet aktiveret" + "Automatisk genstart kan slås til/fra i Bluetooth-indstillingerne." + "Deaktiver" + "Automatisk ændring af Bluetooth-tilstand" diff --git a/android/app/res/values-de/strings.xml b/android/app/res/values-de/strings.xml index 1fbadb5b6c..b6cd552271 100644 --- a/android/app/res/values-de/strings.xml +++ b/android/app/res/values-de/strings.xml @@ -135,12 +135,8 @@ "Auf deinem Gerät bleibt Bluetooth im Flugmodus eingeschaltet. Schalte Bluetooth aus, wenn du das nicht möchtest." "WLAN und Bluetooth bleiben eingeschaltet" "Auf deinem Gerät bleiben WLAN und Bluetooth im Flugmodus eingeschaltet. Schalte sie aus, wenn du das nicht möchtest." - - - - - - - - + "Bluetooth wurde automatisch aktiviert" + "Der automatische Neustart kann in den Bluetooth-Einstellungen aktiviert oder deaktiviert werden." + "Deaktivieren" + "Automatische Änderung des Bluetooth-Status" diff --git a/android/app/res/values-en-rAU/strings.xml b/android/app/res/values-en-rAU/strings.xml index 1e7c5a49d8..d249d7f0eb 100644 --- a/android/app/res/values-en-rAU/strings.xml +++ b/android/app/res/values-en-rAU/strings.xml @@ -135,12 +135,8 @@ "Your device remembers to keep Bluetooth on in aeroplane mode. Turn off Bluetooth if you don\'t want it to stay on." "Wi-Fi and Bluetooth stay on" "Your device remembers to keep Wi-Fi and Bluetooth on in aeroplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on." - - - - - - - - + "Bluetooth has been automatically enabled" + "Automatic restart can be toggled in Bluetooth settings." + "Turn off" + "Bluetooth automatic state change" diff --git a/android/app/res/values-en-rGB/strings.xml b/android/app/res/values-en-rGB/strings.xml index 1e7c5a49d8..d249d7f0eb 100644 --- a/android/app/res/values-en-rGB/strings.xml +++ b/android/app/res/values-en-rGB/strings.xml @@ -135,12 +135,8 @@ "Your device remembers to keep Bluetooth on in aeroplane mode. Turn off Bluetooth if you don\'t want it to stay on." "Wi-Fi and Bluetooth stay on" "Your device remembers to keep Wi-Fi and Bluetooth on in aeroplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on." - - - - - - - - + "Bluetooth has been automatically enabled" + "Automatic restart can be toggled in Bluetooth settings." + "Turn off" + "Bluetooth automatic state change" diff --git a/android/app/res/values-en-rIN/strings.xml b/android/app/res/values-en-rIN/strings.xml index 1e7c5a49d8..d249d7f0eb 100644 --- a/android/app/res/values-en-rIN/strings.xml +++ b/android/app/res/values-en-rIN/strings.xml @@ -135,12 +135,8 @@ "Your device remembers to keep Bluetooth on in aeroplane mode. Turn off Bluetooth if you don\'t want it to stay on." "Wi-Fi and Bluetooth stay on" "Your device remembers to keep Wi-Fi and Bluetooth on in aeroplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on." - - - - - - - - + "Bluetooth has been automatically enabled" + "Automatic restart can be toggled in Bluetooth settings." + "Turn off" + "Bluetooth automatic state change" diff --git a/android/app/res/values-es-rUS/strings.xml b/android/app/res/values-es-rUS/strings.xml index a013f620af..f58355cea3 100644 --- a/android/app/res/values-es-rUS/strings.xml +++ b/android/app/res/values-es-rUS/strings.xml @@ -135,12 +135,8 @@ "El dispositivo dejará activado el Bluetooth en el modo de avión. Desactiva el Bluetooth si no quieres que permanezca activado." "El Wi-Fi y el Bluetooth permanecen activados" "El dispositivo dejará activado el Wi-Fi y el Bluetooth en el modo de avión. Desactívalos si no quieres que permanezcan activados." - - - - - - - - + "El Bluetooth se habilitó automáticamente" + "El reinicio automático se puede activar o desactivar en la configuración de Bluetooth." + "Desactivar" + "Cambio automático del estado de Bluetooth" diff --git a/android/app/res/values-eu/strings.xml b/android/app/res/values-eu/strings.xml index 24d8aed471..ff0b32d38e 100644 --- a/android/app/res/values-eu/strings.xml +++ b/android/app/res/values-eu/strings.xml @@ -135,12 +135,8 @@ "Hegaldi moduan, Bluetootha aktibatuta mantentzeaz gogoratzen da gailua. Halakorik nahi ez baduzu, desaktiba ezazu zuk zeuk." "Wifia eta Bluetootha aktibatuta mantentzen dira" "Hegaldi moduan, wifia eta Bluetootha aktibatuta mantentzeaz gogoratzen da gailua. Halakorik nahi ez baduzu, desaktiba itzazu zuk zeuk." - - - - - - - - + "Bluetootha automatikoki gaitu da" + "Bluetootharen ezarpenetan alda daiteke automatikoki berrabiarazteko aukera." + "Desaktibatu" + "Bluetootharen egoera automatikoki aldatu da" diff --git a/android/app/res/values-fa/strings.xml b/android/app/res/values-fa/strings.xml index 6aa5474add..87bfa9627b 100644 --- a/android/app/res/values-fa/strings.xml +++ b/android/app/res/values-fa/strings.xml @@ -135,12 +135,8 @@ "دستگاهتان به‌یاد می‌آورد که بلوتوث را در «حالت هواپیما» روشن نگه دارد. اگر نمی‌خواهید بلوتوث روشن بماند، آن را خاموش کنید." "‏‫Wi-Fi و بلوتوث روشن بماند" "‏دستگاهتان به‌یاد می‌آورد که Wi-Fi و بلوتوث را در «حالت هواپیما» روشن نگه دارد. اگر نمی‌خواهید Wi-Fi و بلوتوث روشن بمانند، آن‌ها را خاموش کنید." - - - - - - - - + "بلوتوث به‌طور خودکار فعال شد" + "بازراه‌اندازی خودکار را می‌توان در تنظیمات بلوتوث روشن/خاموش کرد." + "خاموش کردن" + "تغییر خودکار وضعیت بلوتوث" diff --git a/android/app/res/values-fi/strings.xml b/android/app/res/values-fi/strings.xml index db9cabf177..110df13623 100644 --- a/android/app/res/values-fi/strings.xml +++ b/android/app/res/values-fi/strings.xml @@ -135,12 +135,8 @@ "Laitteen Bluetooth pysyy päällä lentokonetilassa. Voit halutessasi laittaa Bluetooth-yhteyden pois päältä." "Wi-Fi ja Bluetooth pysyvät päällä" "Laitteen Wi-Fi-yhteys ja Bluetooth pysyvät päällä lentokonetilassa. Voit halutessasi laittaa ne pois päältä." - - - - - - - - + "Bluetooth on otettu automaattisesti käyttöön" + "Automaattisen uudelleenkäynnistyksen voi laittaa päälle/pois Bluetoothin asetuksista." + "Laita pois päältä" + "Bluetoothin automaattiasetuksen muutos" diff --git a/android/app/res/values-fr-rCA/strings.xml b/android/app/res/values-fr-rCA/strings.xml index e4de284699..8ddbe92685 100644 --- a/android/app/res/values-fr-rCA/strings.xml +++ b/android/app/res/values-fr-rCA/strings.xml @@ -135,12 +135,8 @@ "Votre appareil se souvient de garder le Bluetooth activé en mode Avion. Désactivez le Bluetooth si vous ne souhaitez pas qu\'il reste activé." "Le Wi-Fi et le Bluetooth restent activés" "Votre appareil se souvient de garder le Wi-Fi et le Bluetooth activés en mode Avion. Désactivez le Wi-Fi et le Bluetooth si vous ne souhaitez pas qu\'ils restent activés." - - - - - - - - + "Le Bluetooth a été automatiquement activé" + "Le redémarrage automatique peut être activé/désactivé dans les paramètres Bluetooth." + "Désactiver" + "Changement d\'état automatique du Bluetooth" diff --git a/android/app/res/values-gl/strings.xml b/android/app/res/values-gl/strings.xml index 5e176a3120..a0ffe6be27 100644 --- a/android/app/res/values-gl/strings.xml +++ b/android/app/res/values-gl/strings.xml @@ -135,12 +135,8 @@ "O teu dispositivo lembrará manter o Bluetooth activado no modo avión. Se non queres que permaneza nese estado, desactívao." "A wifi e o Bluetooth permanecen activados" "O teu dispositivo lembrará manter a wifi e o Bluetooth activados no modo avión. Se non queres que permanezan nese estado, desactívaos." - - - - - - - - + "Activouse automaticamente o Bluetooth" + "O reinicio automático pode activarse e desactivarse na configuración do Bluetooth." + "Desactivar" + "Cambio automático do estado do Bluetooth" diff --git a/android/app/res/values-gu/strings.xml b/android/app/res/values-gu/strings.xml index d00949ab45..2a34120952 100644 --- a/android/app/res/values-gu/strings.xml +++ b/android/app/res/values-gu/strings.xml @@ -135,12 +135,8 @@ "તમારું ડિવાઇસ બ્લૂટૂથને એરપ્લેન મોડમાં ચાલુ રાખવાનું યાદ રાખે છે. જો તમે બ્લૂટૂથ ચાલુ રાખવા માગતા ન હો, તો તેને બંધ કરો." "વાઇ-ફાઇ અને બ્લૂટૂથ ચાલુ રહે છે" "તમારું ડિવાઇસ વાઇ-ફાઇ અને બ્લૂટૂથને એરપ્લેન મોડમાં ચાલુ રાખવાનું યાદ રાખે છે. જો તમે વાઇ-ફાઇ અને બ્લૂટૂથ ચાલુ રાખવા માગતા ન હો, તો તેને બંધ કરો." - - - - - - - - + "બ્લૂટૂથ ઑટોમૅટિક રીતે ચાલુ થઈ ગયું છે" + "બ્લૂટૂથ સેટિંગમાં જઈને ઑટોમૅટિક રીતે ફરી શરૂ કરવાની સુવિધા ટૉગલ કરી શકાય છે." + "બંધ કરો" + "બ્લૂટૂથ ઑટોમૅટિક રીતે ચાલુ થવાનું સેટિંગ બદલવામાં આવ્યું છે" diff --git a/android/app/res/values-hi/strings.xml b/android/app/res/values-hi/strings.xml index 5b28bdac4f..6622a3e410 100644 --- a/android/app/res/values-hi/strings.xml +++ b/android/app/res/values-hi/strings.xml @@ -135,12 +135,8 @@ "फ़्लाइट मोड में भी, आपके डिवाइस का ब्लूटूथ चालू रहता है. अगर ब्लूटूथ चालू नहीं रखना है, तो उसे बंद कर दें." "वाई-फ़ाई और ब्लूटूथ चालू रहते हैं" "फ़्लाइट मोड में भी, आपके डिवाइस का वाई-फ़ाई और ब्लूटूथ चालू रहता है. अगर वाई-फ़ाई और ब्लूटूथ को चालू नहीं रखना है, तो उन्हें बंद कर दें." - - - - - - - - + "ब्लूटूथ अपने-आप चालू हो गया है" + "ब्लूटूथ की सेटिंग में अपने-आप रीस्टार्ट होने की सुविधा को टॉगल किया जा सकता है." + "बंद करें" + "ब्लूटूथ अपने-आप चालू होने की सेटिंग को बदल दिया गया है" diff --git a/android/app/res/values-hu/strings.xml b/android/app/res/values-hu/strings.xml index 0de5d2a747..3372a85737 100644 --- a/android/app/res/values-hu/strings.xml +++ b/android/app/res/values-hu/strings.xml @@ -135,12 +135,8 @@ "Az eszköz bekapcsolva tartja a Bluetootht Repülős üzemmódban. Kapcsolja ki a Bluetootht, ha nem szeretné, hogy bekapcsolva maradjon." "A Wi-Fi és a Bluetooth bekapcsolva marad" "Az eszköz bekapcsolva tartja a Wi‑Fi-t és a Bluetootht Repülős üzemmódban. Ha nem szeretné, hogy bekapcsolva maradjon a Wi-Fi és a Bluetooth, kapcsolja ki őket." - - - - - - - - + "A Bluetooth automatikusan engedélyezve" + "Az automatikus újraindítás a Bluetooth beállításai között kapcsolható be és ki." + "Igen" + "Bluetooth állapotának automatikus módosítása" diff --git a/android/app/res/values-hy/strings.xml b/android/app/res/values-hy/strings.xml index ea50a39510..381f3e833a 100644 --- a/android/app/res/values-hy/strings.xml +++ b/android/app/res/values-hy/strings.xml @@ -135,12 +135,8 @@ "Ավիառեժիմում Bluetooth-ը միացված կմնա։ Ցանկության դեպքում կարող եք անջատել Bluetooth-ը։" "Wi-Fi-ը և Bluetooth-ը մնում են միացված" "Ավիառեժիմում Wi-Fi-ը և Bluetooth-ը միացված կմնան։ Ցանկության դեպքում կարող եք անջատել Wi-Fi-ը և Bluetooth-ը։" - - - - - - - - + "Bluetooth-ն ավտոմատ միացել է" + "Ավտոմատ վերագործարկումը կարող եք միացնել/անջատել Bluetooth-ի կարգավորումներում։" + "Անջատել" + "Bluetooth-ի ավտոմատ կարգավիճակի փոփոխություն" diff --git a/android/app/res/values-in/strings.xml b/android/app/res/values-in/strings.xml index 822d50395f..ab72716ce2 100644 --- a/android/app/res/values-in/strings.xml +++ b/android/app/res/values-in/strings.xml @@ -135,12 +135,8 @@ "Perangkat akan mengingat untuk tetap mengaktifkan Bluetooth dalam mode pesawat. Nonaktifkan jika Anda tidak ingin Bluetooth terus aktif." "Wi-Fi dan Bluetooth tetap aktif" "Perangkat akan mengingat untuk tetap mengaktifkan Wi-Fi dan Bluetooth dalam mode pesawat. Nonaktifkan jika Anda tidak ingin Wi-Fi dan Bluetooth terus aktif." - - - - - - - - + "Bluetooth telah otomatis diaktifkan" + "Mulai ulang otomatis dapat diaktifkan/dinonaktifkan di Setelan Bluetooth." + "Nonaktifkan" + "Status otomatis Bluetooth diubah" diff --git a/android/app/res/values-is/strings.xml b/android/app/res/values-is/strings.xml index 527c1f9586..107f0ae5e9 100644 --- a/android/app/res/values-is/strings.xml +++ b/android/app/res/values-is/strings.xml @@ -135,12 +135,8 @@ "Tækið man að hafa kveikt á Bluetooth í flugstillingu. Slökktu á Bluetooth ef þú vilt ekki hafa kveikt á því." "Áfram verður kveikt á Wi-Fi og Bluetooth" "Tæki man að hafa kveikt á Wi-Fi og Bluetooth í flugstillingu. Slökktu á Wi-Fi og Bluetooth ef þú vilt ekki hafa kveikt á þessu." - - - - - - - - + "Kveikt var á Bluetooth sjálfkrafa" + "Hægt er að kveikja/slökkva á sjálfvirkri endurræsingu í stillingum Bluetooth." + "Slökkva" + "Staða Bluetooth breyttist sjálfkrafa" diff --git a/android/app/res/values-iw/strings.xml b/android/app/res/values-iw/strings.xml index f0b2c79f6d..8073217cab 100644 --- a/android/app/res/values-iw/strings.xml +++ b/android/app/res/values-iw/strings.xml @@ -135,12 +135,8 @@ "‏חיבור ה-Bluetooth במכשיר יישאר מופעל במצב טיסה. אפשר להשבית את ה-Bluetooth אם לא רוצים שהוא יפעל." "‏חיבורי ה-Wi‑Fi וה-Bluetooth יישארו מופעלים" "‏חיבורי ה-Wi‑Fi וה-Bluetooth במכשיר יישארו מופעלים במצב טיסה. אפשר להשבית את ה-Wi-Fi וה-Bluetooth אם לא רוצים שהם יפעלו." - - - - - - - - + "‏‫Bluetooth מופעל באופן אוטומטי" + "‏אפשר להחליף את המצב להפעלה אוטומטית מחדש בהגדרות של Bluetooth." + "השבתה" + "‏החלפת מצב אוטומטית של Bluetooth" diff --git a/android/app/res/values-kk/strings.xml b/android/app/res/values-kk/strings.xml index a8db80af15..72e30ca5cf 100644 --- a/android/app/res/values-kk/strings.xml +++ b/android/app/res/values-kk/strings.xml @@ -135,12 +135,8 @@ "Bluetooth ұшақ режимінде қосылып тұрады. Қаласаңыз, оны өшіріп қоюыңызға болады." "Wi-Fi мен Bluetooth қосулы тұрады" "Wi‑Fi мен Bluetooth ұшақ режимінде қосылып тұрады. Қаласаңыз, оларды өшіріп қоюыңызға болады." - - - - - - - - + "Bluetooth автоматты түрде іске қосылды" + "Автоматты түрде өшіріп қосуды Bluetooth параметрлерін ауыстыруға болады." + "Өшіру" + "Bluetooth-тің күйін автоматты түрде өзгерту" diff --git a/android/app/res/values-kn/strings.xml b/android/app/res/values-kn/strings.xml index 82be48a7e4..3378aeac60 100644 --- a/android/app/res/values-kn/strings.xml +++ b/android/app/res/values-kn/strings.xml @@ -135,12 +135,8 @@ "ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ನಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರಿಸಿಕೊಳ್ಳುವುದನ್ನು ನಿಮ್ಮ ಸಾಧನ ನೆನಪಿನಲ್ಲಿರಿಸಿಕೊಳ್ಳುತ್ತದೆ. ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರಿಸಲು ನೀವು ಬಯಸದಿದ್ದರೆ ಅದನ್ನು ಆಫ್ ಮಾಡಿ." "ವೈ-ಫೈ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರುತ್ತದೆ" "ವೈ-ಫೈ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಅನ್ನು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ನಲ್ಲಿ ಇರಿಸಿಕೊಳ್ಳಲು ನಿಮ್ಮ ಸಾಧನ ನೆನಪಿನಲ್ಲಿರಿಸಿಕೊಳ್ಳುತ್ತದೆ. ವೈಫೈ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರಿಸಲು ನೀವು ಬಯಸದಿದ್ದರೆ ಅವುಗಳನ್ನು ಆಫ್ ಮಾಡಿ." - - - - - - - - + "ಬ್ಲೂಟೂತ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" + "ಸ್ವಯಂಚಾಲಿತ ಮರುಪ್ರಾರಂಭವನ್ನು ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಟಾಗಲ್ ಮಾಡಬಹುದು." + "ಆಫ್ ಮಾಡಿ" + "ಬ್ಲೂಟೂತ್ ಸ್ವಯಂಚಾಲಿತ ಸ್ಥಿತಿಯ ಬದಲಾವಣೆ" diff --git a/android/app/res/values-ko/strings.xml b/android/app/res/values-ko/strings.xml index ed0785fbb8..91204090cb 100644 --- a/android/app/res/values-ko/strings.xml +++ b/android/app/res/values-ko/strings.xml @@ -135,12 +135,8 @@ "비행기 모드에서 기기의 블루투스가 켜진 상태로 유지됩니다. 유지하지 않으려면 블루투스를 사용 중지하세요." "Wi-Fi 및 블루투스 계속 사용" "비행기 모드에서 기기의 Wi-Fi 및 블루투스가 켜진 상태로 유지됩니다. 유지하지 않으려면 Wi-Fi와 블루투스를 사용 중지하세요." - - - - - - - - + "블루투스가 자동으로 사용 설정되었습니다" + "자동 재시작 기능은 블루투스 설정에서 전환할 수 있습니다." + "사용 중지" + "블루투스 자동 상태 변경" diff --git a/android/app/res/values-ky/strings.xml b/android/app/res/values-ky/strings.xml index fc2ae6ad6b..397cae1bb2 100644 --- a/android/app/res/values-ky/strings.xml +++ b/android/app/res/values-ky/strings.xml @@ -135,12 +135,8 @@ "Түзмөгүңүз учак режиминде Bluetooth\'га туташкан бойдон калат. Кааласаңыз, Bluetooth\'ду өчүрүп койсоңуз болот." "Wi-Fi менен Bluetooth күйүк бойдон калат" "Түзмөгүңүз учак режиминде Wi‑Fi\'га жана Bluetooth\'га туташкан бойдон калат. Кааласаңыз, Wi-Fi менен Bluetooth\'ду өчүрүп койсоңуз болот." - - - - - - - - + "Bluetooth автоматтык түрдө иштетилди" + "Автоматтык түрдө өчүрүп күйгүзүүнү Bluetooth жөндөөлөрүнөн өчүрүп/күйгүзүгө болот." + "Өчүрүү" + "Bluetooth\'тун абалын автоматтык түрдө өзгөртүү" diff --git a/android/app/res/values-lt/strings.xml b/android/app/res/values-lt/strings.xml index a41898cad6..ab601bb139 100644 --- a/android/app/res/values-lt/strings.xml +++ b/android/app/res/values-lt/strings.xml @@ -135,12 +135,8 @@ "Įrenginys prisimena, kad lėktuvo režimu reikia palikti įjungtą „Bluetooth“ ryšį. Išjunkite „Bluetooth“, jei nenorite, kad jis liktų įjungtas." "„Wi‑Fi“ ir „Bluetooth“ ryšys lieka įjungtas" "Įrenginys prisimena, kad lėktuvo režimu reikia palikti įjungtą „Wi‑Fi“ ir „Bluetooth“ ryšį. Išjunkite „Wi-Fi“ ir „Bluetooth“, jei nenorite, kad jie liktų įjungti." - - - - - - - - + "„Bluetooth“ įgalinta automatiškai" + "Automatinį paleidimą iš naujo galima perjungti „Bluetooth“ nustatymuose." + "Išjungti" + "„Bluetooth“ automatinis būsenos pakeitimas" diff --git a/android/app/res/values-lv/strings.xml b/android/app/res/values-lv/strings.xml index 626f89e45f..cdd2af8f54 100644 --- a/android/app/res/values-lv/strings.xml +++ b/android/app/res/values-lv/strings.xml @@ -135,12 +135,8 @@ "Lidojuma režīmā ierīcē joprojām būs ieslēgts Bluetooth savienojums. Izslēdziet Bluetooth savienojumu, ja nevēlaties, lai tas paliktu ieslēgts." "Wi-Fi savienojums un tehnoloģija Bluetooth paliek ieslēgta" "Lidojuma režīmā ierīcē joprojām būs ieslēgti Wi-Fi un Bluetooth savienojumi. Izslēdziet Wi-Fi un Bluetooth savienojumus, ja nevēlaties, lai tie paliktu ieslēgti." - - - - - - - - + "Bluetooth savienojums ir iespējots automātiski" + "Automātisko restartēšanu var pārslēgt Bluetooth iestatījumos" + "Izslēgt" + "Automātiska Bluetooth stāvokļa maiņa" diff --git a/android/app/res/values-mk/strings.xml b/android/app/res/values-mk/strings.xml index 3da12700d5..72a03256e0 100644 --- a/android/app/res/values-mk/strings.xml +++ b/android/app/res/values-mk/strings.xml @@ -135,12 +135,8 @@ "Уредот помни да го задржи Bluetooth вклучен во авионски режим. Исклучете го Bluetooth ако не сакате да остане вклучен." "Wi-Fi и Bluetooth остануваат вклучени" "Уредот помни да ги задржи Wi‑Fi и Bluetooth вклучени во авионски режим. Исклучете ги Wi-Fi и Bluetooth ако не сакате да бидат вклучени." - - - - - - - - + "Bluetooth е овозможен автоматски" + "Автоматското рестартирање може да се вклучи/исклучи во поставките за Bluetooth." + "Исклучи" + "Автоматска промена на состојбата на Bluetooth" diff --git a/android/app/res/values-mn/strings.xml b/android/app/res/values-mn/strings.xml index 3c3b110889..86e5c8110e 100644 --- a/android/app/res/values-mn/strings.xml +++ b/android/app/res/values-mn/strings.xml @@ -135,12 +135,8 @@ "Таны төхөөрөмж Bluetooth-г нислэгийн горимд асаалттай байлгахыг санана. Хэрэв та асаалттай байлгахыг хүсэхгүй байвал Bluetooth-г унтраана уу." "Wi-Fi болон Bluetooth асаалттай хэвээр байна" "Таны төхөөрөмж Wi-Fi болон Bluetooth-г нислэгийн горимд асаалттай байлгахыг санана. Хэрэв та Wi-Fi болон Bluetooth-г асаалттай байлгахыг хүсэхгүй байвал тэдгээрийг унтраана уу." - - - - - - - - + "Bluetooth-г автоматаар идэвхжүүлсэн" + "Автоматаар дахин эхлүүлэхийг Bluetooth-н Тохиргоонд асаах/унтраах боломжтой." + "Унтраах" + "Bluetooth-н автомат төлөвийн өөрчлөлт" diff --git a/android/app/res/values-my/strings.xml b/android/app/res/values-my/strings.xml index 1ceb35b0bb..b60ecaf69b 100644 --- a/android/app/res/values-my/strings.xml +++ b/android/app/res/values-my/strings.xml @@ -135,12 +135,8 @@ "လေယာဉ်ပျံမုဒ်သုံးစဉ် ဘလူးတုသ် ဆက်ဖွင့်ထားရန် သင့်စက်က မှတ်မိသည်။ ဘလူးတုသ် ဆက်ဖွင့်မထားလိုပါက ပိတ်နိုင်သည်။" "Wi-Fi နှင့် ဘလူးတုသ် ဆက်ဖွင့်ထားသည်" "လေယာဉ်ပျံမုဒ်သုံးစဉ် Wi-Fi နှင့် ဘလူးတုသ် ဆက်ဖွင့်ထားရန် သင့်စက်က မှတ်မိသည်။ Wi-Fi နှင့် ဘလူးတုသ် ဆက်ဖွင့်မထားလိုပါက ပိတ်နိုင်သည်။" - - - - - - - - + "ဘလူးတုသ်ကို အလိုအလျောက်ဖွင့်ထားသည်" + "အလိုအလျောက်ပြန်စခြင်းကို ဘလူးတုသ်ဆက်တင်များတွင် ပြောင်းနိုင်သည်။" + "ပိတ်ရန်" + "အလိုအလျောက် ဘလူးတုသ်အခြေအနေ ပြောင်းလဲမှု" diff --git a/android/app/res/values-nb/strings.xml b/android/app/res/values-nb/strings.xml index fe754cb2bc..f12753c03d 100644 --- a/android/app/res/values-nb/strings.xml +++ b/android/app/res/values-nb/strings.xml @@ -135,12 +135,8 @@ "Enheten husker at Bluetooth skal være på i flymodus. Slå av Bluetooth hvis du ikke vil at det skal være på." "Wifi og Bluetooth holdes påslått" "Enheten husker at wifi og Bluetooth skal være på i flymodus. Slå av wifi og Bluetooth hvis du ikke vil at de skal være på." - - - - - - - - + "Bluetooth er slått på automatisk" + "Du kan slå automatisk omstart av/på i Bluetooth-innstillingene." + "Slå av" + "Bluetooth endret tilstand automatisk" diff --git a/android/app/res/values-or/strings.xml b/android/app/res/values-or/strings.xml index bf2b3528ad..cee3fad4ed 100644 --- a/android/app/res/values-or/strings.xml +++ b/android/app/res/values-or/strings.xml @@ -135,12 +135,8 @@ "ଆପଣଙ୍କ ଡିଭାଇସ ଏୟାରପ୍ଲେନ ମୋଡରେ ବ୍ଲୁଟୁଥକୁ ଚାଲୁ ରଖିବା ପାଇଁ ମନେ ରଖେ। ଯଦି ଆପଣ ବ୍ଲୁଟୁଥ ଚାଲୁ ରହୁ ବୋଲି ଚାହୁଁନାହାଁନ୍ତି ତେବେ ଏହାକୁ ବନ୍ଦ କରନ୍ତୁ।" "ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥ ଚାଲୁ ରହେ" "ଆପଣଙ୍କ ଡିଭାଇସ ଏୟାରପ୍ଲେନ ମୋଡରେ ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥକୁ ଚାଲୁ ରଖିବା ପାଇଁ ମନେ ରଖେ। ଯଦି ଆପଣ ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥ ଚାଲୁ ରହୁ ବୋଲି ଚାହୁଁନାହାଁନ୍ତି ତେବେ ସେଗୁଡ଼ିକୁ ବନ୍ଦ କରନ୍ତୁ।" - - - - - - - - + "ବ୍ଲୁଟୁଥକୁ ସ୍ୱତଃ ସକ୍ଷମ କରାଯାଇଛି" + "ବ୍ଲୁଟୁଥ ସେଟିଂସରେ ସ୍ଵତଃ ରିଷ୍ଟାର୍ଟ ଟୋଗଲ କରାଯାଇପାରିବ।" + "ବନ୍ଦ କରନ୍ତୁ" + "ବ୍ଲୁଟୁଥର ସ୍ୱତଃ ସ୍ଥିତି ପରିବର୍ତ୍ତନ" diff --git a/android/app/res/values-pa/strings.xml b/android/app/res/values-pa/strings.xml index b00a405210..5d98280dc5 100644 --- a/android/app/res/values-pa/strings.xml +++ b/android/app/res/values-pa/strings.xml @@ -135,12 +135,8 @@ "ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਰੱਖਣਾ ਯਾਦ ਰੱਖਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਸਨੂੰ ਚਾਲੂ ਨਹੀਂ ਰੱਖਣਾ ਚਾਹੁੰਦੇ, ਤਾਂ ਬਲੂਟੁੱਥ ਨੂੰ ਬੰਦ ਕਰੋ।" "ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਚਾਲੂ ਰਹਿੰਦੇ ਹਨ" "ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਰੱਖਣਾ ਯਾਦ ਰੱਖਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਨ੍ਹਾਂ ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਰੱਖਣਾ ਚਾਹੁੰਦੇ, ਤਾਂ ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਬੰਦ ਕਰੋ।" - - - - - - - - + "ਬਲੂਟੁੱਥ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕੀਤਾ ਗਿਆ ਹੈ" + "ਸਵੈਚਲਿਤ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਨੂੰ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਟੌਗਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।" + "ਬੰਦ ਕਰੋ" + "ਬਲੂਟੁੱਥ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਨੂੰ ਬਦਲ ਦਿੱਤਾ ਗਿਆ ਹੈ" diff --git a/android/app/res/values-pl/strings.xml b/android/app/res/values-pl/strings.xml index 058ae68ca2..521210df9d 100644 --- a/android/app/res/values-pl/strings.xml +++ b/android/app/res/values-pl/strings.xml @@ -135,12 +135,8 @@ "Bluetooth na urządzeniu pozostaje włączony w trybie samolotowym. Wyłącz Bluetooth, jeśli nie chcesz, żeby pozostawał włączony." "Wi-Fi i Bluetooth pozostają włączone" "Wi-Fi i Bluetooth na urządzeniu pozostają włączone w trybie samolotowym. Wyłącz Wi-Fi i Bluetooth, jeśli nie chcesz, żeby funkcje te pozostawały włączone." - - - - - - - - + "Bluetooth został automatycznie włączony" + "Automatyczne ponowne uruchamianie można włączyć w Ustawieniach Bluetootha." + "Wyłącz" + "Automatyczna zmiana stanu Bluetooth" diff --git a/android/app/res/values-pt/strings.xml b/android/app/res/values-pt/strings.xml index 6a25590df5..040d10321b 100644 --- a/android/app/res/values-pt/strings.xml +++ b/android/app/res/values-pt/strings.xml @@ -135,12 +135,8 @@ "O dispositivo vai manter o Bluetooth ativado no modo avião. Ele poderá ser desativado manualmente se você preferir." "O Wi-Fi e o Bluetooth ficam ativados" "O dispositivo vai manter o Wi-Fi e o Bluetooth ativados no modo avião. Eles podem ser desativados manualmente se você preferir." - - - - - - - - + "O Bluetooth foi ativado automaticamente" + "A reinicialização automática pode ser ativada nas configurações do Bluetooth." + "Desativar" + "Mudança automática de estado do Bluetooth" diff --git a/android/app/res/values-ro/strings.xml b/android/app/res/values-ro/strings.xml index d1c7ead954..e1408360ab 100644 --- a/android/app/res/values-ro/strings.xml +++ b/android/app/res/values-ro/strings.xml @@ -135,12 +135,8 @@ "Dispozitivul reține să păstreze Bluetooth activat în modul Avion. Dezactivează Bluetooth dacă nu vrei să rămână activat." "Wi-Fi și Bluetooth rămân activate" "Dispozitivul reține să păstreze funcțiile Wi-Fi și Bluetooth activate în modul Avion. Dezactivează Wi-Fi și Bluetooth dacă nu vrei să rămână activate." - - - - - - - - + "Bluetooth s-a activat automat" + "Repornirea automată poate fi comutată în Setările Bluetooth." + "Dezactivează" + "Schimbare automată de stare Bluetooth" diff --git a/android/app/res/values-ru/strings.xml b/android/app/res/values-ru/strings.xml index 8c983c505d..0107dba39d 100644 --- a/android/app/res/values-ru/strings.xml +++ b/android/app/res/values-ru/strings.xml @@ -135,12 +135,8 @@ "Функция Bluetooth останется включенной в режиме полета. Вы можете отключить ее, если хотите." "Функции Wi‑Fi и Bluetooth остаются включенными" "Wi‑Fi и Bluetooth останутся включенными в режиме полета. Вы можете отключить их, если хотите." - - - - - - - - + "Bluetooth включен автоматически" + "В настройках Bluetooth можно включить автоматический перезапуск." + "Отключить" + "Автоматическое изменение состояния Bluetooth" diff --git a/android/app/res/values-si/strings.xml b/android/app/res/values-si/strings.xml index 4366a2ec95..9f26042644 100644 --- a/android/app/res/values-si/strings.xml +++ b/android/app/res/values-si/strings.xml @@ -135,12 +135,8 @@ "ඔබේ උපාංගයට අහස්යානා ආකාරයේ බ්ලූටූත් ක්‍රියාත්මකව තබා ගැනීමට මතකයි. ඔබට බ්ලූටූත් ක්‍රියාත්මක වීමට අවශ්‍ය නොවේ නම් එය ක්‍රියාවිරහිත කරන්න." "Wi-Fi සහ බ්ලූටූත් ක්‍රියාත්මකව පවතී" "ඔබේ උපාංගයට අහස්යානා ආකාරයේ Wi-Fi සහ බ්ලූටූත් ක්‍රියාත්මකව තබා ගැනීමට මතකයි. Wi-Fi සහ බ්ලූටූත් ඒවා ක්‍රියාත්මක වීමට ඔබට අවශ්‍ය නැතිනම් ක්‍රියා විරහිත කරන්න." - - - - - - - - + "බ්ලූටූත් ස්වයංක්‍රීයව සබල කර ඇත" + "බ්ලූටූත් සැකසීම් තුළ ස්වයංක්‍රීය නැවත ආරම්භ කිරීම ටොගල් කළ හැක." + "අක්‍රිය කරන්න" + "බ්ලූටූත් ස්වයංක්‍රීය තත්ත්‍වය වෙනස් කිරීම" diff --git a/android/app/res/values-sk/strings.xml b/android/app/res/values-sk/strings.xml index fd007b4954..05797b14d8 100644 --- a/android/app/res/values-sk/strings.xml +++ b/android/app/res/values-sk/strings.xml @@ -135,12 +135,8 @@ "Zariadenie si pamätá, aby v režime v lietadle nevypínalo rozhranie Bluetooth. Ak ho nechcete ponechať zapnuté, vypnite ho." "Wi‑Fi a Bluetooth zostanú zapnuté" "Zariadenie si pamätá, aby v režime v lietadle nevypínalo Wi‑Fi ani Bluetooth. Ak ich nechcete ponechať zapnuté, vypnite ich." - - - - - - - - + "Rozhranie Bluetooth bolo automaticky zapnuté" + "Automatický reštart sa dá prepnúť v nastaveniach rozhrania Bluetooth." + "Vypnúť" + "Automatická zmena stavu rozhrania Bluetooth" diff --git a/android/app/res/values-sq/strings.xml b/android/app/res/values-sq/strings.xml index 07374fc3eb..f1f46ec661 100644 --- a/android/app/res/values-sq/strings.xml +++ b/android/app/res/values-sq/strings.xml @@ -135,12 +135,8 @@ "Pajisja jote kujtohet që ta mbajë Bluetooth-in të aktivizuar në modalitetin e aeroplanit. Çaktivizo Bluetooth-in nëse nuk dëshiron që të qëndrojë i aktivizuar." "Wi-Fi dhe Bluetooth-i qëndrojnë aktivë" "Pajisja jote kujtohet që ta mbajë Wi-Fi dhe Bluetooth-in të aktivizuar në modalitetin e aeroplanit. Çaktivizo Wi-Fi dhe Bluetooth-in nëse nuk dëshiron që të qëndrojnë aktivë." - - - - - - - - + "Bluetooth-i është aktivizuar automatikisht" + "Rinisja automatike mund të aktivizohet/çaktivizohet te \"Cilësimet\" e Bluetooth-it." + "Çaktivizo" + "Ndryshimi automatik i gjendjes së Bluetooth-it" diff --git a/android/app/res/values-sr/strings.xml b/android/app/res/values-sr/strings.xml index 5a82f8b376..8ac47dd9ad 100644 --- a/android/app/res/values-sr/strings.xml +++ b/android/app/res/values-sr/strings.xml @@ -135,12 +135,8 @@ "Уређај памти да не треба да искључује Bluetooth у режиму рада у авиону. Искључите Bluetooth ако не желите да остане укључен." "WiFi и Bluetooth остају укључени" "Уређај памти да не треба да искључује WiFi и Bluetooth у режиму рада у авиону. Искључите WiFi и Bluetooth ако не желите да остану укључени." - - - - - - - - + "Bluetooth је аутоматски омогућен" + "Аутоматски рестарт може да се укључи или искључи у подешавањима Bluetooth-а." + "Искључи" + "Аутоматски статус Bluetooth-а је промењен" diff --git a/android/app/res/values-sv/strings.xml b/android/app/res/values-sv/strings.xml index 6d178be8f7..829ee819a3 100644 --- a/android/app/res/values-sv/strings.xml +++ b/android/app/res/values-sv/strings.xml @@ -135,12 +135,8 @@ "Enheten kommer ihåg att hålla Bluetooth aktiverat i flygplansläge. Inaktivera Bluetooth om du inte vill att det ska hållas aktiverat." "Wifi och Bluetooth ska vara aktiverade" "Enheten kommer ihåg att hålla wifi och Bluetooth aktiverade i flygplansläge. Du kan inaktivera wifi och Bluetooth om du inte vill hålla dem aktiverade." - - - - - - - - + "Bluetooth har aktiverats automatiskt" + "Automatisk omstart kan aktiveras och inaktiveras i Bluetooth-inställningarna." + "Inaktivera" + "Ändring av automatiskt Bluetooth-läge" diff --git a/android/app/res/values-ta/strings.xml b/android/app/res/values-ta/strings.xml index 1e23b0daa0..149e81e69b 100644 --- a/android/app/res/values-ta/strings.xml +++ b/android/app/res/values-ta/strings.xml @@ -135,12 +135,8 @@ "உங்கள் சாதனம் விமானப் பயன்முறையில் புளூடூத்தை இயக்கத்திலேயே வைத்திருக்கும். புளூடூத்தை இயக்கத்தில் வைத்திருக்க விரும்பவில்லை எனில் நீங்கள் அதை முடக்கலாம்." "வைஃபையும் புளூடூத்தும் இயக்கத்திலேயே இருத்தல்" "உங்கள் சாதனம் விமானப் பயன்முறையில் வைஃபையையும் புளூடூத்தையும் இயக்கத்திலேயே வைத்திருக்கும். வைஃபையையும் புளூடூத்தையும் இயக்கத்தில் வைத்திருக்க விரும்பவில்லை எனில் நீங்கள் அவற்றை முடக்கலாம்." - - - - - - - - + "புளூடூத் தானாகவே இயக்கப்பட்டுள்ளது" + "புளூடூத் அமைப்புகளில் தானாகவே மீண்டும் தொடங்கப்படுவதை நிலைமாற்றலாம்." + "முடக்கு" + "புளூடூத் தானியங்கு நிலை மாற்றம்" diff --git a/android/app/res/values-tr/strings.xml b/android/app/res/values-tr/strings.xml index 24d23bbe8f..f8e54e8b59 100644 --- a/android/app/res/values-tr/strings.xml +++ b/android/app/res/values-tr/strings.xml @@ -135,12 +135,8 @@ "Cihazınız, uçak modundayken Bluetooth\'u açık tutmayı hatırlar. Açık kalmasını istemiyorsanız Bluetooth\'u kapatın." "Kablosuz bağlantı ve Bluetooth açık kalır" "Cihazınız, uçak modundayken kablosuz bağlantıyı ve Bluetooth\'u açık tutmayı hatırlar. Açık kalmasını istemiyorsanız kablosuz bağlantıyı ve Bluetooth\'u kapatın." - - - - - - - - + "Bluetooth otomatik olarak etkinleştirildi" + "Otomatik yeniden başlatma düğmesi, Bluetooth ayarlarından açılıp kapatılabilir." + "Kapat" + "Bluetooth otomatik durum değişikliği" diff --git a/android/app/res/values-uk/strings.xml b/android/app/res/values-uk/strings.xml index 07d95eca42..f3478016e8 100644 --- a/android/app/res/values-uk/strings.xml +++ b/android/app/res/values-uk/strings.xml @@ -135,12 +135,8 @@ "У режимі польоту функція Bluetooth на пристрої залишатиметься ввімкненою. За бажання її можна вимкнути." "Wi-Fi і Bluetooth залишаються ввімкненими" "У режимі польоту функції Wi-Fi і Bluetooth на пристрої залишатимуться ввімкненими. За бажання їх можна вимкнути." - - - - - - - - + "Bluetooth увімкнено автоматично" + "Автоматичний перезапуск можна вмикати й вимикати в налаштуваннях Bluetooth." + "Вимкнути" + "Автоматичне змінення стану Bluetooth" diff --git a/android/app/res/values-uz/strings.xml b/android/app/res/values-uz/strings.xml index a85718cc32..7cbf0bc3ff 100644 --- a/android/app/res/values-uz/strings.xml +++ b/android/app/res/values-uz/strings.xml @@ -135,12 +135,8 @@ "Qurilmangiz parvoz rejimida Bluetooth yoqilganini eslab qoladi. Yoniq qolmasligi uchun Bluetooth aloqasini oʻchiring." "Wi-Fi va Bluetooth yoniq qoladi" "Qurilmangiz parvoz rejimida Wi‑Fi va Bluetooth yoqilganini eslab qoladi. Yoniq qolmasligi uchun Wi-Fi va Bluetooth aloqasini oʻchiring." - - - - - - - - + "Bluetooth avtomatik yoqilgan" + "Avtomatik qayta yoqishni Bluetooth sozlamalarida belgilash mumkin." + "Faolsizlantirish" + "Bluetooth holatini avtomatik oʻzgartirish" diff --git a/android/app/res/values-vi/strings.xml b/android/app/res/values-vi/strings.xml index eed845b7f6..e842d6d6f9 100644 --- a/android/app/res/values-vi/strings.xml +++ b/android/app/res/values-vi/strings.xml @@ -135,12 +135,8 @@ "Thiết bị của bạn sẽ luôn bật Bluetooth ở chế độ trên máy bay. Nếu không muốn như vậy thì bạn có thể tắt Bluetooth." "Wi-Fi và Bluetooth vẫn đang bật" "Thiết bị của bạn sẽ luôn bật Wi-Fi và Bluetooth ở chế độ trên máy bay. Nếu không muốn như vậy thì bạn có thể tắt Wi-Fi và Bluetooth." - - - - - - - - + "Bluetooth đã được tự động bật" + "Bạn có thể bật/tắt tính năng Tự động khởi động lại trong phần Cài đặt Bluetooth." + "Tắt" + "Tự động thay đổi trạng thái Bluetooth" diff --git a/android/app/res/values-zh-rCN/strings.xml b/android/app/res/values-zh-rCN/strings.xml index 041101f028..a387723b0a 100644 --- a/android/app/res/values-zh-rCN/strings.xml +++ b/android/app/res/values-zh-rCN/strings.xml @@ -135,12 +135,8 @@ "在飞行模式下设备将记住保持开启蓝牙。如果您不想保持开启和蓝牙，请关闭蓝牙。" "WLAN 和蓝牙保持开启状态" "在飞行模式下设备将记住保持开启 WLAN 和蓝牙。如果您不想保持开启 WLAN 和蓝牙，请关闭 WLAN 和蓝牙。" - - - - - - - - + "已自动启用蓝牙" + "可在蓝牙设置中开启/关闭自动重启功能。" + "关闭" + "蓝牙自动状态变更" diff --git a/android/app/res/values-zh-rHK/strings.xml b/android/app/res/values-zh-rHK/strings.xml index a805eb5e00..d3ccdf2020 100644 --- a/android/app/res/values-zh-rHK/strings.xml +++ b/android/app/res/values-zh-rHK/strings.xml @@ -135,12 +135,8 @@ "裝置會記得在飛行模式下保持藍牙開啟。如果你不希望保持開啟，請關閉藍牙。" "Wi-Fi 和藍牙保持開啟" "裝置會記得在飛行模式下保持 Wi-Fi 及藍牙開啟。如果你不希望保持開啟，請關閉 Wi-Fi 及藍牙。" - - - - - - - - + "已自動啟用藍牙" + "可在藍牙設定中開啟或關閉自動重新啟動功能。" + "關閉" + "藍牙自動狀態變更" diff --git a/android/app/res/values-zh-rTW/strings.xml b/android/app/res/values-zh-rTW/strings.xml index 11b3d30680..db74c3706a 100644 --- a/android/app/res/values-zh-rTW/strings.xml +++ b/android/app/res/values-zh-rTW/strings.xml @@ -135,12 +135,8 @@ "裝置會記得在飛航模式下讓藍牙保持開啟狀態。如果不要保持開啟狀態，請關閉藍牙。" "Wi-Fi 和藍牙會保持開啟狀態" "裝置會記得在飛航模式下讓 Wi-Fi 和藍牙保持開啟狀態。如果不要保持開啟狀態，請關閉 Wi-Fi 和藍牙。" - - - - - - - - + "藍牙已自動啟用" + "可在藍牙設定中開啟或關閉自動重新啟動功能。" + "關閉" + "藍牙自動狀態變更" diff --git a/android/app/res/values-zu/strings.xml b/android/app/res/values-zu/strings.xml index 56f61627ee..0a5d456c5e 100644 --- a/android/app/res/values-zu/strings.xml +++ b/android/app/res/values-zu/strings.xml @@ -135,12 +135,8 @@ "Idivayisi yakho ikhumbula ukugcina i-Bluetooth ivuliwe kumodi yendiza. Vala i-Bluetooth uma ungafuni ukuthi ihlale ivuliwe." "I-Wi-Fi ne-Bluetooth kuhlala kuvuliwe" "Ifoni yakho ikhumbula ukugcina i-Wi-Fi ne-Bluetooth kuvuliwe kumodi yendiza. Vala i-Wi-Fi ne-Bluetooth uma ungafuni ukuthi ihlale ivuliwe." - - - - - - - - + "I-Bluetooth inikwe amandla ngokuzenzekelayo" + "Ukuqalisa kabusha okuzenzekelayo kungashintshwa Kumasethingi e-Bluetooth." + "Vala" + "Ukushintsha kwesimo se-Bluetooth okuzenzekelayo" -- cgit v1.2.3-59-g8ed1b From 87d1a9990bd60410eeed0656033d94a3267bedd9 Mon Sep 17 00:00:00 2001 From: Henri Chataing Date: Thu, 22 Feb 2024 14:33:26 -0800 Subject: system/bta/jv: Conflict resolution for libbluetooth_log migration Ignore-AOSP-First: Conflict resolution Test: m com.android.btservices Bug: 305066880 Flag: EXEMPT, mechanical refactor Change-Id: Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4 --- system/bta/jv/bta_jv_act.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/system/bta/jv/bta_jv_act.cc b/system/bta/jv/bta_jv_act.cc index a1ceb36d83..6964100ffa 100644 --- a/system/bta/jv/bta_jv_act.cc +++ b/system/bta/jv/bta_jv_act.cc @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -55,6 +56,7 @@ #include "types/raw_address.h" using namespace bluetooth::legacy::stack::sdp; +using namespace bluetooth; tBTA_JV_CB bta_jv_cb; std::unordered_set used_l2cap_classic_dynamic_psm; @@ -1515,11 +1517,10 @@ static void bta_jv_port_mgmt_sr_cback(uint32_t code, uint16_t port_handle) { p_pcb_new_listen->rfcomm_slot_id = p_cb->p_cback(BTA_JV_RFCOMM_SRV_OPEN_EVT, &evt_data, rfcomm_slot_id); if (p_pcb_new_listen->rfcomm_slot_id == 0) { - LOG(ERROR) << __func__ << ": rfcomm_slot_id == " - << p_pcb_new_listen->rfcomm_slot_id; + log::error("rfcomm_slot_id == {}", p_pcb_new_listen->rfcomm_slot_id); } else { - VLOG(2) << __func__ << ": curr_sess=" << p_cb->curr_sess - << ", max_sess=" << p_cb->max_sess; + log::verbose("curr_sess={}, max_sess={}", p_cb->curr_sess, + p_cb->max_sess); failed = false; } } else -- cgit v1.2.3-59-g8ed1b