From f165b9c886476889d99edad8d3e43b2980b855a1 Mon Sep 17 00:00:00 2001 From: Marek Z Jeziorek Date: Sat, 22 Feb 2020 21:43:12 +0000 Subject: New priority scripts + critical updates to fonts. Author: Marek Z. Jeziorek Needs to be submitted with https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10280447 BUGANIZER BUGS Addressed ======================== BUG: 111550750 BUG: 139104208 BUG: 148752969 BUG: 148752946 CHANGES ======= Remove font files no longer required deleted: other/NotoSansAdlam-Regular.ttf deleted: other/NotoSansGeorgian-Bold.otf deleted: other/NotoSansGeorgian-Medium.otf deleted: other/NotoSansGeorgian-Regular.otf deleted: other/NotoSansJavanese-Regular.ttf deleted: other/NotoSansTifinagh-Regular.ttf deleted: other/NotoSerifGeorgian-Bold.otf deleted: other/NotoSerifGeorgian-Regular.otf modified: fonts.mk modified: other/Android.bp Replacements for the above deleted files: new file: other/NotoSansAdlam-VF.ttf new file: other/NotoSansGeorgian-VF.ttf new file: other/NotoSansJavanese-Regular.otf new file: other/NotoSansTifinagh-Regular.otf new file: other/NotoSerifGeorgian-VF.ttf New additions to Android fonts (living/revival languages): new file: other/NotoSansGunjalaGondi-Regular.otf new file: other/NotoSansHanifiRohingya-Regular.otf new file: other/NotoSansKhojki-Regular.otf new file: other/NotoSansMasaramGondi-Regular.otf new file: other/NotoSansWancho-Regular.otf new file: other/NotoSansWarangCiti-Regular.otf Test: =================================================== Test: on Android (click on a link within a browser): Test: Adlam https://en.wikipedia.org/wiki/Adlam_(Unicode_block) Test: Georgian https://en.wikipedia.org/wiki/Georgian_(Unicode_block) Test: Georgian https://en.wikipedia.org/wiki/Georgian_Extended Test: Gunjala Gondi https://en.wikipedia.org/wiki/Gunjala_Gondi_(Unicode_block) Test: Hanifi Rohingya https://en.wikipedia.org/wiki/Hanifi_Rohingya_(Unicode_block) Test: Javanese https://en.wikipedia.org/wiki/Javanese_(Unicode_block) Test: Khojki https://en.wikipedia.org/wiki/Khojki_(Unicode_block) Test: Masaram Gondi https://en.wikipedia.org/wiki/Masaram_Gondi_(Unicode_block) Test: Tifinagh https://en.wikipedia.org/wiki/Tifinagh_(Unicode_block) Test: Wancho https://en.wikipedia.org/wiki/Wancho_(Unicode_block) Test: Warang Citi https://en.wikipedia.org/wiki/Warang_Citi_(Unicode_block) Test: =================================================== Test: on Android (click on a link within a browser): Test: udhr Adlam https://unicode.org/udhr/d/udhr_fuf_adlm.html Test: udhr Georgian https://unicode.org/udhr/d/udhr_kat.html Test: udhr Gunjala Gondi NA (Not Available) Test: udhr Hanifi Rohingya NA (Not Available) Test: udhr Javanese https://unicode.org/udhr/d/udhr_jav_java.html Test: udhr Khojki NA (Not Available) Test: udhr Masaram Gondi NA (Not Available) Test: udhr Tifinagh https://unicode.org/udhr/d/udhr_tzm_tfng.html Test: udhr Wancho NA (Not Available) Test: udhr Warang Citi NA (Not Available) Test: =================================== Test: on Android (comparing two systems - before/after) Test: Georgian: Systems settings menus compared side by side Test: =================================== Test: on Mac (comparing the existing Android fonts with the new font Test: using diffenator - https://github.com/googlefonts/fontdiffenator) Test: =================================== Test: SansAdlam-VF: VALIDATED Test: SansGeorgian-VF: VALIDATED Test: SansGunjalaGondi: NEW (No Applicable) Test: SansHanifiRohingya: NEW (No Applicable) Test: SansJavanese: VALIDATED Test: SansKhojki: NEW (No Applicable) Test: SansMasaramGondi: NEW (No Applicable) Test: SansTifinagh: VALIDATED Test: SansWancho: NEW (No Applicable) Test: SansWarangCiti: NEW (No Applicable) Test: SerifGeorgian-VF: VALIDATED Change-Id: I41e030b63f83ec243ae6f174c061faa5298bd6dc Signed-off-by: Marek Z Jeziorek --- tools/image_generator/ImageGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index fd8e54295..1da43e5c6 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -123,7 +123,7 @@ public class ImageGenerator { put("hy", "NotoSansArmenian-Regular"); put("iw", "NotoSansHebrew-Regular"); put("ja", "NotoSansCJK-Regular"); - put("ka", "NotoSansGeorgian-Regular"); + put("ka", "NotoSansGeorgian-VF"); put("ko", "NotoSansCJK-Regular"); put("km", "NotoSansKhmerUI-Regular"); put("kn", "NotoSansKannadaUI-Regular"); -- cgit v1.2.3 From d7e0920489f232983754e783f3eb2ab707cb4dc8 Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Mon, 24 Feb 2020 01:43:09 +0000 Subject: Revert "New priority scripts + critical updates to fonts." Revert "New priority scripts + critical updates to fonts." Revert submission 10387937-system_fonts_update Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6229266&lkbb=6230292&fkbb=6229328, bug b/150095308 Reverted Changes: I41e030b63:New priority scripts + critical updates to fonts. I030e650b8:New priority scripts + critical updates to fonts. I86d46f4b6:New priority scripts + critical updates to fonts. Change-Id: I1ea1fd8314fae95ad7ec07d41b3ff55ef2e0333e --- tools/image_generator/ImageGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 1da43e5c6..fd8e54295 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -123,7 +123,7 @@ public class ImageGenerator { put("hy", "NotoSansArmenian-Regular"); put("iw", "NotoSansHebrew-Regular"); put("ja", "NotoSansCJK-Regular"); - put("ka", "NotoSansGeorgian-VF"); + put("ka", "NotoSansGeorgian-Regular"); put("ko", "NotoSansCJK-Regular"); put("km", "NotoSansKhmerUI-Regular"); put("kn", "NotoSansKannadaUI-Regular"); -- cgit v1.2.3 From 8845e4d7010b588f7fe9b39bef10e925f6269f1e Mon Sep 17 00:00:00 2001 From: Marek Jeziorek Date: Wed, 26 Feb 2020 16:43:36 +0000 Subject: Revert^2 "New priority scripts + critical updates to fonts." After https://googleplex-android-review.git.corp.google.com/q/I403a72608ad3a1034e52a51b73871e08cf6283a4 merger this change should be fine. d7e0920489f232983754e783f3eb2ab707cb4dc8 Change-Id: Ifa8fcc16ed5f3c10c0f9a6605e02f1ff9bddcf31 --- tools/image_generator/ImageGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index fd8e54295..1da43e5c6 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -123,7 +123,7 @@ public class ImageGenerator { put("hy", "NotoSansArmenian-Regular"); put("iw", "NotoSansHebrew-Regular"); put("ja", "NotoSansCJK-Regular"); - put("ka", "NotoSansGeorgian-Regular"); + put("ka", "NotoSansGeorgian-VF"); put("ko", "NotoSansCJK-Regular"); put("km", "NotoSansKhmerUI-Regular"); put("kn", "NotoSansKannadaUI-Regular"); -- cgit v1.2.3 From 025ce540c2fdbf11d618ab7b8218f28dda325c87 Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Fri, 28 Feb 2020 11:22:46 -0800 Subject: minui: remove libadf since it is no longer supported Libadf is being removed since there are no android common kernels that support adf. Remove support from miniui. Test: Compiles and boots Bug: 150467766 Change-Id: Ic66ea7a012b0466810ddeb8f884150b50c8ae769 --- minui/Android.bp | 2 - minui/graphics.cpp | 8 +- minui/graphics_adf.cpp | 200 ------------------------------------------------- minui/graphics_adf.h | 76 ------------------- 4 files changed, 1 insertion(+), 285 deletions(-) delete mode 100644 minui/graphics_adf.cpp delete mode 100644 minui/graphics_adf.h diff --git a/minui/Android.bp b/minui/Android.bp index fff3a8ec9..82588167c 100644 --- a/minui/Android.bp +++ b/minui/Android.bp @@ -27,14 +27,12 @@ cc_library { srcs: [ "events.cpp", "graphics.cpp", - "graphics_adf.cpp", "graphics_drm.cpp", "graphics_fbdev.cpp", "resources.cpp", ], whole_static_libs: [ - "libadf", "libdrm", "libsync", ], diff --git a/minui/graphics.cpp b/minui/graphics.cpp index d34da5674..dce1e619a 100644 --- a/minui/graphics.cpp +++ b/minui/graphics.cpp @@ -25,7 +25,6 @@ #include -#include "graphics_adf.h" #include "graphics_drm.h" #include "graphics_fbdev.h" #include "minui/minui.h" @@ -362,14 +361,9 @@ int gr_init() { ret); } - auto backend = std::unique_ptr{ std::make_unique() }; + auto backend = std::unique_ptr{ std::make_unique() }; gr_draw = backend->Init(); - if (!gr_draw) { - backend = std::make_unique(); - gr_draw = backend->Init(); - } - if (!gr_draw) { backend = std::make_unique(); gr_draw = backend->Init(); diff --git a/minui/graphics_adf.cpp b/minui/graphics_adf.cpp deleted file mode 100644 index 10cd60709..000000000 --- a/minui/graphics_adf.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "graphics_adf.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "minui/minui.h" - -GRSurfaceAdf::~GRSurfaceAdf() { - if (mmapped_buffer_) { - munmap(mmapped_buffer_, pitch * height); - } - if (fence_fd != -1) { - close(fence_fd); - } - if (fd != -1) { - close(fd); - } -} - -std::unique_ptr GRSurfaceAdf::Create(int intf_fd, const drm_mode_modeinfo* mode, - __u32 format, int* err) { - __u32 offset; - __u32 pitch; - auto fd = adf_interface_simple_buffer_alloc(intf_fd, mode->hdisplay, mode->vdisplay, format, - &offset, &pitch); - - if (fd < 0) { - *err = fd; - return nullptr; - } - - std::unique_ptr surf = std::unique_ptr( - new GRSurfaceAdf(mode->hdisplay, mode->vdisplay, pitch, (format == DRM_FORMAT_RGB565 ? 2 : 4), - offset, pitch, fd)); - - auto mmapped = - mmap(nullptr, surf->pitch * surf->height, PROT_WRITE, MAP_SHARED, surf->fd, surf->offset); - if (mmapped == MAP_FAILED) { - *err = -errno; - return nullptr; - } - surf->mmapped_buffer_ = static_cast(mmapped); - return surf; -} - -MinuiBackendAdf::MinuiBackendAdf() : intf_fd(-1), dev(), current_surface(0), n_surfaces(0) {} - -int MinuiBackendAdf::InterfaceInit() { - adf_interface_data intf_data; - if (int err = adf_get_interface_data(intf_fd, &intf_data); err < 0) return err; - - int result = 0; - surfaces[0] = GRSurfaceAdf::Create(intf_fd, &intf_data.current_mode, format, &result); - if (!surfaces[0]) { - fprintf(stderr, "Failed to allocate surface 0: %s\n", strerror(-result)); - goto done; - } - - surfaces[1] = GRSurfaceAdf::Create(intf_fd, &intf_data.current_mode, format, &result); - if (!surfaces[1]) { - fprintf(stderr, "Failed to allocate surface 1: %s\n", strerror(-result)); - n_surfaces = 1; - } else { - n_surfaces = 2; - } - -done: - adf_free_interface_data(&intf_data); - return result; -} - -int MinuiBackendAdf::DeviceInit(adf_device* dev) { - adf_id_t intf_id; - int err = adf_find_simple_post_configuration(dev, &format, 1, &intf_id, &eng_id); - if (err < 0) return err; - - err = adf_device_attach(dev, eng_id, intf_id); - if (err < 0 && err != -EALREADY) return err; - - intf_fd = adf_interface_open(dev, intf_id, O_RDWR | O_CLOEXEC); - if (intf_fd < 0) return intf_fd; - - err = InterfaceInit(); - if (err < 0) { - close(intf_fd); - intf_fd = -1; - } - - return err; -} - -GRSurface* MinuiBackendAdf::Init() { - PixelFormat pixel_format = gr_pixel_format(); - if (pixel_format == PixelFormat::ABGR) { - format = DRM_FORMAT_ABGR8888; - } else if (pixel_format == PixelFormat::BGRA) { - format = DRM_FORMAT_BGRA8888; - } else if (pixel_format == PixelFormat::RGBX) { - format = DRM_FORMAT_RGBX8888; - } else { - format = DRM_FORMAT_RGB565; - } - - adf_id_t* dev_ids = nullptr; - ssize_t n_dev_ids = adf_devices(&dev_ids); - if (n_dev_ids == 0) { - return nullptr; - } else if (n_dev_ids < 0) { - fprintf(stderr, "enumerating adf devices failed: %s\n", strerror(-n_dev_ids)); - return nullptr; - } - - intf_fd = -1; - - for (ssize_t i = 0; i < n_dev_ids && intf_fd < 0; i++) { - int err = adf_device_open(dev_ids[i], O_RDWR, &dev); - if (err < 0) { - fprintf(stderr, "opening adf device %u failed: %s\n", dev_ids[i], strerror(-err)); - continue; - } - - err = DeviceInit(&dev); - if (err < 0) { - fprintf(stderr, "initializing adf device %u failed: %s\n", dev_ids[i], strerror(-err)); - adf_device_close(&dev); - } - } - - free(dev_ids); - - if (intf_fd < 0) return nullptr; - - GRSurface* ret = Flip(); - - Blank(true); - Blank(false); - - return ret; -} - -void MinuiBackendAdf::Sync(GRSurfaceAdf* surf) { - static constexpr unsigned int kWarningTimeout = 3000; - - if (surf == nullptr) return; - - if (surf->fence_fd >= 0) { - int err = sync_wait(surf->fence_fd, kWarningTimeout); - if (err < 0) { - perror("adf sync fence wait error\n"); - } - - close(surf->fence_fd); - surf->fence_fd = -1; - } -} - -GRSurface* MinuiBackendAdf::Flip() { - const auto& surf = surfaces[current_surface]; - - int fence_fd = adf_interface_simple_post(intf_fd, eng_id, surf->width, surf->height, format, - surf->fd, surf->offset, surf->pitch, -1); - if (fence_fd >= 0) surf->fence_fd = fence_fd; - - current_surface = (current_surface + 1) % n_surfaces; - Sync(surfaces[current_surface].get()); - return surfaces[current_surface].get(); -} - -void MinuiBackendAdf::Blank(bool blank) { - adf_interface_blank(intf_fd, blank ? DRM_MODE_DPMS_OFF : DRM_MODE_DPMS_ON); -} - -MinuiBackendAdf::~MinuiBackendAdf() { - adf_device_close(&dev); - if (intf_fd >= 0) close(intf_fd); -} diff --git a/minui/graphics_adf.h b/minui/graphics_adf.h deleted file mode 100644 index 79d8d2acb..000000000 --- a/minui/graphics_adf.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include -#include - -#include - -#include - -#include "graphics.h" -#include "minui/minui.h" - -class GRSurfaceAdf : public GRSurface { - public: - ~GRSurfaceAdf() override; - - static std::unique_ptr Create(int intf_fd, const drm_mode_modeinfo* mode, - __u32 format, int* err); - - uint8_t* data() override { - return mmapped_buffer_; - } - - private: - friend class MinuiBackendAdf; - - GRSurfaceAdf(size_t width, size_t height, size_t row_bytes, size_t pixel_bytes, __u32 offset, - __u32 pitch, int fd) - : GRSurface(width, height, row_bytes, pixel_bytes), offset(offset), pitch(pitch), fd(fd) {} - - const __u32 offset; - const __u32 pitch; - - int fd; - int fence_fd{ -1 }; - uint8_t* mmapped_buffer_{ nullptr }; -}; - -class MinuiBackendAdf : public MinuiBackend { - public: - MinuiBackendAdf(); - ~MinuiBackendAdf() override; - GRSurface* Init() override; - GRSurface* Flip() override; - void Blank(bool) override; - - private: - int InterfaceInit(); - int DeviceInit(adf_device* dev); - void Sync(GRSurfaceAdf* surf); - - int intf_fd; - adf_id_t eng_id; - __u32 format; - adf_device dev; - size_t current_surface; - size_t n_surfaces; - std::unique_ptr surfaces[2]; -}; -- cgit v1.2.3 From 37304af78d702def097c87fa8704df28fcb8166e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 3 Mar 2020 05:43:38 -0800 Subject: Import translations. DO NOT MERGE Auto-generated-cl: translation import Change-Id: Ibe3f73243852bfbf10bcdfea4f8dcca4a10233dc --- tools/recovery_l10n/res/values-ar/strings.xml | 4 ++-- tools/recovery_l10n/res/values-hy/strings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/recovery_l10n/res/values-ar/strings.xml b/tools/recovery_l10n/res/values-ar/strings.xml index 69191287d..a9cd2d133 100644 --- a/tools/recovery_l10n/res/values-ar/strings.xml +++ b/tools/recovery_l10n/res/values-ar/strings.xml @@ -1,11 +1,11 @@ - "جارٍ تثبيت إعادة تحميل النظام" + "جارٍ تثبيت تحديث النظام" "جارٍ محو البيانات" "ليس هناك أي أمر" "خطأ!" - "جارٍ تثبيت إعادة تحميل الأمان" + "جارٍ تثبيت تحديث الأمان" "‏يتعذَّر تحميل نظام Android، حيث قد تكون بياناتك تالفة. وإذا استمر ظهور هذه الرسالة، قد يتعيَّن عليك إجراء إعادة الضبط على الإعدادات الأصلية ومحو جميع بيانات المستخدم المُخزَّنة على هذا الجهاز." "إعادة المحاولة" "إعادة الضبط على الإعدادات الأصلية" diff --git a/tools/recovery_l10n/res/values-hy/strings.xml b/tools/recovery_l10n/res/values-hy/strings.xml index 35a0ab113..76c28a707 100644 --- a/tools/recovery_l10n/res/values-hy/strings.xml +++ b/tools/recovery_l10n/res/values-hy/strings.xml @@ -9,6 +9,6 @@ "Չհաջողվեց բեռնել Android համակարգը։ Հնարավոր է՝ ձեր տվյալները վնասված են։ Եթե նորից տեսնեք այս հաղորդագրությունը, փորձեք վերակայել սարքի կարգավորումները և ջնջել օգտատիրոջ բոլոր տվյալները։" "Նորից փորձել" "Վերակայել բոլոր տվյալները" - "Մաքրե՞լ օգտատիրոջ բոլոր տվյալները։\n\n ԱՅՍ ԳՈՐԾՈՂՈՒԹՅՈՒՆԸ ՀՆԱՐԱՎՈՐ ՉԻ ԼԻՆԻ ՀԵՏԱՐԿԵԼ" + "Ջնջե՞լ օգտատիրոջ բոլոր տվյալները։\n\n ԱՅՍ ԳՈՐԾՈՂՈՒԹՅՈՒՆԸ ՀՆԱՐԱՎՈՐ ՉԻ ԼԻՆԻ ՀԵՏԱՐԿԵԼ" "Չեղարկել" -- cgit v1.2.3 From 345b9ccd205e62414e0b3748ebe92f080e851944 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 16 Jul 2020 23:38:38 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Idd40506426de42081a35dd176b4861426ee1e8c0 --- tools/recovery_l10n/res/values-ur/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ur/strings.xml b/tools/recovery_l10n/res/values-ur/strings.xml index da03f1972..13dc6b37d 100644 --- a/tools/recovery_l10n/res/values-ur/strings.xml +++ b/tools/recovery_l10n/res/values-ur/strings.xml @@ -6,9 +6,9 @@ "کوئی کمانڈ نہیں ہے" "خرابی!" "سیکیورٹی اپ ڈیٹ انسٹال ہو رہی ہے" - "‏Android سسٹم لوڈ نہیں کیا جا سکتا۔ آپ کا ڈیٹا خراب ہو سکتا ہے۔ اگر آپ کو مستقل یہ پیغام موصول ہوتا ہے تو آپ کو فیکٹری ڈیٹا کی دوبارہ ترتیب انجام دینے اور اس آلہ پر اسٹور کردہ سبھی صارف ڈیٹا کو مٹانے کی ضرورت پڑ سکتی ہے۔" + "‏Android سسٹم لوڈ نہیں کیا جا سکتا۔ آپ کا ڈیٹا خراب ہو سکتا ہے۔ اگر آپ کو مستقل یہ پیغام موصول ہوتا ہے تو آپ کو فیکٹری ڈیٹا ری سیٹ انجام دینے اور اس آلہ پر اسٹور کردہ سبھی صارف ڈیٹا کو مٹانے کی ضرورت پڑ سکتی ہے۔" "دوبارہ کوشش کریں" - "فیکٹری ڈیٹا کی دوبارہ ترتیب" + "فیکٹری ڈیٹا ری سیٹ" "سبھی صارف ڈیٹا صاف کریں؟\n\n اسے کالعدم نہیں کیا جا سکتا!" "منسوخ کریں" -- cgit v1.2.3 From 22dc3387818901374dfd3176297ee958dca0ec96 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 31 Jul 2020 23:03:10 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I116cbdd9d0162a1ce2f60366fe6f13b76e188ac1 --- tools/recovery_l10n/res/values-ur/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ur/strings.xml b/tools/recovery_l10n/res/values-ur/strings.xml index da03f1972..13dc6b37d 100644 --- a/tools/recovery_l10n/res/values-ur/strings.xml +++ b/tools/recovery_l10n/res/values-ur/strings.xml @@ -6,9 +6,9 @@ "کوئی کمانڈ نہیں ہے" "خرابی!" "سیکیورٹی اپ ڈیٹ انسٹال ہو رہی ہے" - "‏Android سسٹم لوڈ نہیں کیا جا سکتا۔ آپ کا ڈیٹا خراب ہو سکتا ہے۔ اگر آپ کو مستقل یہ پیغام موصول ہوتا ہے تو آپ کو فیکٹری ڈیٹا کی دوبارہ ترتیب انجام دینے اور اس آلہ پر اسٹور کردہ سبھی صارف ڈیٹا کو مٹانے کی ضرورت پڑ سکتی ہے۔" + "‏Android سسٹم لوڈ نہیں کیا جا سکتا۔ آپ کا ڈیٹا خراب ہو سکتا ہے۔ اگر آپ کو مستقل یہ پیغام موصول ہوتا ہے تو آپ کو فیکٹری ڈیٹا ری سیٹ انجام دینے اور اس آلہ پر اسٹور کردہ سبھی صارف ڈیٹا کو مٹانے کی ضرورت پڑ سکتی ہے۔" "دوبارہ کوشش کریں" - "فیکٹری ڈیٹا کی دوبارہ ترتیب" + "فیکٹری ڈیٹا ری سیٹ" "سبھی صارف ڈیٹا صاف کریں؟\n\n اسے کالعدم نہیں کیا جا سکتا!" "منسوخ کریں" -- cgit v1.2.3 From c6820e1c20a2daf0881c03708ffaafbe3871969b Mon Sep 17 00:00:00 2001 From: Marek Z Jeziorek Date: Tue, 15 Sep 2020 22:47:39 +0000 Subject: Update Armenian fonts to a variable format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 168657713 Test: All tests below are manual. Test: 0. Open a reference device with an existing set of fonts Test: 1. Upload new fonts.xml and the new fonts to a test device Test: 2. Change language to Armenian on both devices (look for Հայերեն or similar) Test: 3. Open settings on both devices and visually compare them (they should be the same) Test: 4. Open the following pages on the test device (and on a reference device): Test: https://en.wikipedia.org/wiki/Armenian_(Unicode_block) Test: https://unicode.org/udhr/d/udhr_hye.html Test: https://hy.wikipedia.org/wiki/%D5%80%D5%A1%D5%B5%D5%A5%D6%80%D5%A5%D5%B6 Test: ... and visually compare them (they should be the same) Change-Id: If95a0f26fb46c030a7f50bd001474bd9a1a103bc --- tools/image_generator/ImageGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 1da43e5c6..fb68fd498 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -120,7 +120,7 @@ public class ImageGenerator { put("fa", "NotoNaskhArabicUI-Regular"); put("gu", "NotoSansGujaratiUI-Regular"); put("hi", "NotoSansDevanagariUI-Regular"); - put("hy", "NotoSansArmenian-Regular"); + put("hy", "NotoSansArmenian-VF"); put("iw", "NotoSansHebrew-Regular"); put("ja", "NotoSansCJK-Regular"); put("ka", "NotoSansGeorgian-VF"); -- cgit v1.2.3 From 29f1fba107df9a94042d33ca9e3b03e8d02d52d9 Mon Sep 17 00:00:00 2001 From: Marek Z Jeziorek Date: Thu, 24 Sep 2020 04:08:09 +0000 Subject: Update Ethiopic fonts to a variable format Bug: 169374341 Test: All tests below are manual. Test: 0. Open a reference device with an existing set of fonts Test: 1. Upload new fonts.xml and the new fonts to a test device Test: 2. Change language to Ethiopic on both devices Test: 3. Open settings on both devices and visually compare them (they should be the same) Test: 4. Open the following pages on the test device (and on a reference device): Test: https://en.wikipedia.org/wiki/Ethiopic_(Unicode_block) Test: https://unicode.org/udhr/d/udhr_amh.html Test: https://www.wordproject.org/bibles/verses/amharic/26_peace.htm Test: ... and visually compare them (they should be the same) Test: to look at recovery `adb reboot recovery`, then use the button to select graphic test. Change-Id: I1a7e92cfd580bdb122c1038538afb007bfcf780f --- tools/image_generator/ImageGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index fb68fd498..8251a414f 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -113,7 +113,7 @@ public class ImageGenerator { private static final Map LANGUAGE_TO_FONT_MAP = new TreeMap() { { - put("am", "NotoSansEthiopic-Regular"); + put("am", "NotoSansEthiopic-VF"); put("ar", "NotoNaskhArabicUI-Regular"); put("as", "NotoSansBengaliUI-Regular"); put("bn", "NotoSansBengaliUI-Regular"); -- cgit v1.2.3 From 3f325800af81c97662f2c0bcb5c34ea0375b461a Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Sun, 18 Oct 2020 15:07:17 +0000 Subject: Migrate system/core/adb to packages/modules/adb BUG: 167963357 Test: TH Change-Id: Ied65135d7c635d1675af591ccc64c26632935161 --- minadbd/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minadbd/Android.bp b/minadbd/Android.bp index b6ca59efa..fb51a799a 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -24,7 +24,7 @@ cc_defaults { cpp_std: "experimental", include_dirs: [ - "system/core/adb", + "packages/modules/adb", ], header_libs: [ -- cgit v1.2.3 From 1503248b7931541c3986bf2aa1a4c0bd5e688d4d Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Fri, 23 Oct 2020 22:46:09 +0000 Subject: Migrate system/core/adb to packages/modules/adb BUG: 167963357 Test: TH Merged-In: Ied65135d7c635d1675af591ccc64c26632935161 Change-Id: I9dc89eb980796b84bbfbc9d977bb473473a933e5 --- minadbd/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minadbd/Android.bp b/minadbd/Android.bp index 4cdcac6d9..4999a9460 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -24,7 +24,7 @@ cc_defaults { cpp_std: "experimental", include_dirs: [ - "system/core/adb", + "packages/modules/adb", ], header_libs: [ -- cgit v1.2.3 From a501d0b39aa5fdeb5761590b9d508e6f63ced0b8 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 10 Nov 2020 13:45:48 +0000 Subject: Import translations. DO NOT MERGE Auto-generated-cl: translation import Change-Id: I01a663c6f8cb274551e120936bce5ae19866d24b --- tools/recovery_l10n/res/values-ur/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ur/strings.xml b/tools/recovery_l10n/res/values-ur/strings.xml index da03f1972..13dc6b37d 100644 --- a/tools/recovery_l10n/res/values-ur/strings.xml +++ b/tools/recovery_l10n/res/values-ur/strings.xml @@ -6,9 +6,9 @@ "کوئی کمانڈ نہیں ہے" "خرابی!" "سیکیورٹی اپ ڈیٹ انسٹال ہو رہی ہے" - "‏Android سسٹم لوڈ نہیں کیا جا سکتا۔ آپ کا ڈیٹا خراب ہو سکتا ہے۔ اگر آپ کو مستقل یہ پیغام موصول ہوتا ہے تو آپ کو فیکٹری ڈیٹا کی دوبارہ ترتیب انجام دینے اور اس آلہ پر اسٹور کردہ سبھی صارف ڈیٹا کو مٹانے کی ضرورت پڑ سکتی ہے۔" + "‏Android سسٹم لوڈ نہیں کیا جا سکتا۔ آپ کا ڈیٹا خراب ہو سکتا ہے۔ اگر آپ کو مستقل یہ پیغام موصول ہوتا ہے تو آپ کو فیکٹری ڈیٹا ری سیٹ انجام دینے اور اس آلہ پر اسٹور کردہ سبھی صارف ڈیٹا کو مٹانے کی ضرورت پڑ سکتی ہے۔" "دوبارہ کوشش کریں" - "فیکٹری ڈیٹا کی دوبارہ ترتیب" + "فیکٹری ڈیٹا ری سیٹ" "سبھی صارف ڈیٹا صاف کریں؟\n\n اسے کالعدم نہیں کیا جا سکتا!" "منسوخ کریں" -- cgit v1.2.3 From fcf4b6bca0b628ec757d6d231212c45a9a3a6b86 Mon Sep 17 00:00:00 2001 From: Lincoln Atkinson Date: Mon, 9 Mar 2020 15:22:29 -0700 Subject: Add support for controlling recovery brightness at exynos-compatible sysfs path Test: manual Bug: 139537581 Exempt-From-Owner-Approval: wear branch Change-Id: I163ea0d5e716c9fad28fb2c64306ed24362c53c7 (cherry picked from commit c9c5fcf8d6c9a6be7a5e07bcf94a3f841eaaca25) (cherry picked from commit 526bd581bca75f93778eb773674773de21fe8f54) --- recovery_ui/ui.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/recovery_ui/ui.cpp b/recovery_ui/ui.cpp index 330721773..6e67b1d4e 100644 --- a/recovery_ui/ui.cpp +++ b/recovery_ui/ui.cpp @@ -48,6 +48,10 @@ constexpr const char* MAX_BRIGHTNESS_FILE = "/sys/class/leds/lcd-backlight/max_b constexpr const char* BRIGHTNESS_FILE_SDM = "/sys/class/backlight/panel0-backlight/brightness"; constexpr const char* MAX_BRIGHTNESS_FILE_SDM = "/sys/class/backlight/panel0-backlight/max_brightness"; +constexpr const char* BRIGHTNESS_FILE_PWM = + "/sys/class/backlight/pwm-backlight.0/brightness"; +constexpr const char* MAX_BRIGHTNESS_FILE_PWM = + "/sys/class/backlight/pwm-backlight.0/max_brightness"; constexpr int kDefaultTouchLowThreshold = 50; constexpr int kDefaultTouchHighThreshold = 90; @@ -106,10 +110,19 @@ bool RecoveryUI::InitScreensaver() { return false; } if (access(brightness_file_.c_str(), R_OK | W_OK)) { - brightness_file_ = BRIGHTNESS_FILE_SDM; + if (!access(BRIGHTNESS_FILE_SDM, R_OK | W_OK)) { + brightness_file_ = BRIGHTNESS_FILE_SDM; + } else { + brightness_file_ = BRIGHTNESS_FILE_PWM; + } } + if (access(max_brightness_file_.c_str(), R_OK)) { - max_brightness_file_ = MAX_BRIGHTNESS_FILE_SDM; + if (!access(MAX_BRIGHTNESS_FILE_SDM, R_OK)) { + max_brightness_file_ = MAX_BRIGHTNESS_FILE_SDM; + } else { + max_brightness_file_ = MAX_BRIGHTNESS_FILE_PWM; + } } // Set the initial brightness level based on the max brightness. Note that reading the initial // value from BRIGHTNESS_FILE doesn't give the actual brightness value (bullhead, sailfish), so -- cgit v1.2.3 From b84e81b2533b03fd3003b7542b17f63733d81554 Mon Sep 17 00:00:00 2001 From: Marek Z Jeziorek Date: Mon, 14 Dec 2020 02:44:28 +0000 Subject: Update Indic scripts Bug: 175510263 Test: Manual Test: https://en.wikipedia.org/wiki/Bengali_(Unicode_block) Test: https://en.wikipedia.org/wiki/Devanagari_(Unicode_block) Test: https://en.wikipedia.org/wiki/Gujarati_(Unicode_block) Test: https://en.wikipedia.org/wiki/Gurmukhi_(Unicode_block) Test: https://en.wikipedia.org/wiki/Kannada_(Unicode_block) Test: https://en.wikipedia.org/wiki/Malayalam_(Unicode_block) Test: https://en.wikipedia.org/wiki/Sinhala_(Unicode_block) Test: https://en.wikipedia.org/wiki/Tamil_(Unicode_block) Test: https://en.wikipedia.org/wiki/Telugu_(Unicode_block) Test: http://www.unicode.org/udhr/d/udhr_ben.html Test: http://www.unicode.org/udhr/d/udhr_hin.html Test: http://www.unicode.org/udhr/d/udhr_guj.html Test: http://unicode.org/udhr/d/udhr_pan.html Test: http://www.unicode.org/udhr/d/udhr_kan.html Test: http://www.unicode.org/udhr/d/udhr_mal.html Test: https://www.unicode.org/udhr/d/udhr_sin.html Test: http://www.unicode.org/udhr/d/udhr_tam.html Test: http://www.unicode.org/udhr/d/udhr_tel.html Change-Id: I60c435f5c45595ed73df2ac4a9f688725f7aad07 --- tools/image_generator/ImageGenerator.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 8251a414f..6c5ea4b5f 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -115,28 +115,28 @@ public class ImageGenerator { { put("am", "NotoSansEthiopic-VF"); put("ar", "NotoNaskhArabicUI-Regular"); - put("as", "NotoSansBengaliUI-Regular"); - put("bn", "NotoSansBengaliUI-Regular"); + put("as", "NotoSansBengaliUI-VF"); + put("bn", "NotoSansBengaliUI-VF"); put("fa", "NotoNaskhArabicUI-Regular"); put("gu", "NotoSansGujaratiUI-Regular"); - put("hi", "NotoSansDevanagariUI-Regular"); + put("hi", "NotoSansDevanagariUI-VF"); put("hy", "NotoSansArmenian-VF"); put("iw", "NotoSansHebrew-Regular"); put("ja", "NotoSansCJK-Regular"); put("ka", "NotoSansGeorgian-VF"); put("ko", "NotoSansCJK-Regular"); put("km", "NotoSansKhmerUI-Regular"); - put("kn", "NotoSansKannadaUI-Regular"); + put("kn", "NotoSansKannadaUI-VF"); put("lo", "NotoSansLaoUI-Regular"); - put("ml", "NotoSansMalayalamUI-Regular"); - put("mr", "NotoSansDevanagariUI-Regular"); + put("ml", "NotoSansMalayalamUI-VF"); + put("mr", "NotoSansDevanagariUI-VF"); put("my", "NotoSansMyanmarUI-Regular"); - put("ne", "NotoSansDevanagariUI-Regular"); + put("ne", "NotoSansDevanagariUI-VF"); put("or", "NotoSansOriya-Regular"); - put("pa", "NotoSansGurmukhiUI-Regular"); - put("si", "NotoSansSinhala-Regular"); - put("ta", "NotoSansTamilUI-Regular"); - put("te", "NotoSansTeluguUI-Regular"); + put("pa", "NotoSansGurmukhiUI-VF"); + put("si", "NotoSansSinhalaUI-VF"); + put("ta", "NotoSansTamilUI-VF"); + put("te", "NotoSansTeluguUI-VF"); put("th", "NotoSansThaiUI-Regular"); put("ur", "NotoNaskhArabicUI-Regular"); put("zh", "NotoSansCJK-Regular"); -- cgit v1.2.3 From d797be33665e9a7202a787d5b239f2acb7068a8d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 25 Dec 2020 12:43:46 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I043a1a7d053a6864e2cbd826888076fb97e8f8fe --- tools/recovery_l10n/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ca/strings.xml b/tools/recovery_l10n/res/values-ca/strings.xml index 6b7bec077..b14a76f06 100644 --- a/tools/recovery_l10n/res/values-ca/strings.xml +++ b/tools/recovery_l10n/res/values-ca/strings.xml @@ -9,6 +9,6 @@ "No s\'ha pogut carregar el sistema Android. És possible que les teves dades estiguin malmeses. Si continues veient aquest missatge, pot ser que hagis de restablir les dades de fàbrica i esborrar totes les dades d\'usuari emmagatzemades en aquest dispositiu." "Torna-ho a provar" "Restableix les dades de fàbrica" - "Vols eliminar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER." + "Vols netejar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER." "Cancel·la" -- cgit v1.2.3 From 8421cc3a649f918225ae6173f5626228239f9fd1 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 30 Dec 2020 23:07:54 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Iff35bc473cc2f0600fae6afc5bf4951c7cc4fe23 --- tools/recovery_l10n/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ca/strings.xml b/tools/recovery_l10n/res/values-ca/strings.xml index 6b7bec077..b14a76f06 100644 --- a/tools/recovery_l10n/res/values-ca/strings.xml +++ b/tools/recovery_l10n/res/values-ca/strings.xml @@ -9,6 +9,6 @@ "No s\'ha pogut carregar el sistema Android. És possible que les teves dades estiguin malmeses. Si continues veient aquest missatge, pot ser que hagis de restablir les dades de fàbrica i esborrar totes les dades d\'usuari emmagatzemades en aquest dispositiu." "Torna-ho a provar" "Restableix les dades de fàbrica" - "Vols eliminar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER." + "Vols netejar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER." "Cancel·la" -- cgit v1.2.3 From 3ee2cf84c961529696fca3056f40aa4820cff7db Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 19 Jan 2021 23:15:52 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ia1bfd6505fe7e2608801d9d1c0dc6f546dba20c7 --- tools/recovery_l10n/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ca/strings.xml b/tools/recovery_l10n/res/values-ca/strings.xml index 6b7bec077..b14a76f06 100644 --- a/tools/recovery_l10n/res/values-ca/strings.xml +++ b/tools/recovery_l10n/res/values-ca/strings.xml @@ -9,6 +9,6 @@ "No s\'ha pogut carregar el sistema Android. És possible que les teves dades estiguin malmeses. Si continues veient aquest missatge, pot ser que hagis de restablir les dades de fàbrica i esborrar totes les dades d\'usuari emmagatzemades en aquest dispositiu." "Torna-ho a provar" "Restableix les dades de fàbrica" - "Vols eliminar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER." + "Vols netejar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER." "Cancel·la" -- cgit v1.2.3 From 0a4e8283574dcf1b0df6f1db4f6a32da45c046e8 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 10 Feb 2021 16:08:51 -0800 Subject: Update ImageGenerator to match the latest font names. To be able to update the font by font updater, the font file needs to match with PostScript names. Bug: 179952916 Test: m fontchain_lint Change-Id: Ie1e2f9ee85625216be6b2cb0781df34faec97673 --- tools/image_generator/ImageGenerator.java | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 6c5ea4b5f..8cc40c6b5 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -113,33 +113,33 @@ public class ImageGenerator { private static final Map LANGUAGE_TO_FONT_MAP = new TreeMap() { { - put("am", "NotoSansEthiopic-VF"); - put("ar", "NotoNaskhArabicUI-Regular"); - put("as", "NotoSansBengaliUI-VF"); - put("bn", "NotoSansBengaliUI-VF"); - put("fa", "NotoNaskhArabicUI-Regular"); - put("gu", "NotoSansGujaratiUI-Regular"); - put("hi", "NotoSansDevanagariUI-VF"); - put("hy", "NotoSansArmenian-VF"); - put("iw", "NotoSansHebrew-Regular"); - put("ja", "NotoSansCJK-Regular"); - put("ka", "NotoSansGeorgian-VF"); - put("ko", "NotoSansCJK-Regular"); - put("km", "NotoSansKhmerUI-Regular"); - put("kn", "NotoSansKannadaUI-VF"); - put("lo", "NotoSansLaoUI-Regular"); - put("ml", "NotoSansMalayalamUI-VF"); - put("mr", "NotoSansDevanagariUI-VF"); + put("am", "NotoSansEthiopic-Regular"); + put("ar", "NotoNaskhArabicUI"); + put("as", "NotoSansBengaliUI-Regular"); + put("bn", "NotoSansBengaliUI-Regular"); + put("fa", "NotoNaskhArabicUI"); + put("gu", "NotoSansGujaratiUI"); + put("hi", "NotoSansDevanagariUI-Regular"); + put("hy", "NotoSansArmenian-Regular"); + put("iw", "NotoSansHebrew"); + put("ja", "NotoSansCJKjp-Regular"); + put("ka", "NotoSansGeorgian-Regular"); + put("ko", "NotoSansCJKjp-Regular"); + put("km", "NotoSansKhmerUI"); + put("kn", "NotoSansKannadaUI-Regular"); + put("lo", "NotoSansLaoUI"); + put("ml", "NotoSansMalayalamUI-Regular"); + put("mr", "NotoSansDevanagariUI-Regular"); put("my", "NotoSansMyanmarUI-Regular"); - put("ne", "NotoSansDevanagariUI-VF"); - put("or", "NotoSansOriya-Regular"); - put("pa", "NotoSansGurmukhiUI-VF"); - put("si", "NotoSansSinhalaUI-VF"); - put("ta", "NotoSansTamilUI-VF"); - put("te", "NotoSansTeluguUI-VF"); - put("th", "NotoSansThaiUI-Regular"); - put("ur", "NotoNaskhArabicUI-Regular"); - put("zh", "NotoSansCJK-Regular"); + put("ne", "NotoSansDevanagariUI-Regular"); + put("or", "NotoSansOriya"); + put("pa", "NotoSansGurmukhiUI-Regular"); + put("si", "NotoSansSinhalaUI-Regular"); + put("ta", "NotoSansTamilUI-Regular"); + put("te", "NotoSansTeluguUI-Regular"); + put("th", "NotoSansThaiUI"); + put("ur", "NotoNaskhArabicUI"); + put("zh", "NotoSansCJKjp-Regular"); } }; @@ -386,7 +386,7 @@ public class ImageGenerator { } String fontName = LANGUAGE_TO_FONT_MAP.getOrDefault(language, DEFAULT_FONT_NAME); - String[] suffixes = {".otf", ".ttf", ".ttc"}; + String[] suffixes = {".otf", ".ttf", ".ttc", ".otc"}; for (String suffix : suffixes) { File fontFile = new File(mFontDirPath, fontName + suffix); if (fontFile.isFile()) { -- cgit v1.2.3 From 7a07b817230a1a8e293600d5bb72bd148ba262b2 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 11 Feb 2021 13:05:07 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I05cba45815f24936879373e79e91d06ce8cef1c5 --- tools/recovery_l10n/res/values-ky/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ky/strings.xml b/tools/recovery_l10n/res/values-ky/strings.xml index 837cf7d68..d4083e46a 100644 --- a/tools/recovery_l10n/res/values-ky/strings.xml +++ b/tools/recovery_l10n/res/values-ky/strings.xml @@ -1,12 +1,12 @@ - "Тутум жаңыртуусу орнотулууда" + "Системанын жаңыртуусу орнотулууда" "Тазаланууда" "Буйрук берилген жок" "Ката!" "Коопсуздук жаңыртуусу орнотулууда" - "Android тутуму жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек." + "Android системасы жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек." "Кайталоо" "Кайра башынан жөндөө" "Колдонуучу дайындарынын баары жашырылсынбы?\n\n МУНУ АРТКА КАЙТАРУУ МҮМКҮН ЭМЕС!" -- cgit v1.2.3 From 1cbb3eb8c3fe7d602dc7e7e43406407efd7e01ff Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 11 Feb 2021 14:26:54 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I3df71337bb73a2c2fb5322ff67e34cb4247f2299 --- tools/recovery_l10n/res/values-ky/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ky/strings.xml b/tools/recovery_l10n/res/values-ky/strings.xml index 837cf7d68..d4083e46a 100644 --- a/tools/recovery_l10n/res/values-ky/strings.xml +++ b/tools/recovery_l10n/res/values-ky/strings.xml @@ -1,12 +1,12 @@ - "Тутум жаңыртуусу орнотулууда" + "Системанын жаңыртуусу орнотулууда" "Тазаланууда" "Буйрук берилген жок" "Ката!" "Коопсуздук жаңыртуусу орнотулууда" - "Android тутуму жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек." + "Android системасы жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек." "Кайталоо" "Кайра башынан жөндөө" "Колдонуучу дайындарынын баары жашырылсынбы?\n\n МУНУ АРТКА КАЙТАРУУ МҮМКҮН ЭМЕС!" -- cgit v1.2.3 From 7f9d1171f62b4ba8f9b0290ddaeae43e02e5dd39 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 3 Mar 2021 17:29:22 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Icb6ccff018ae8cf29f1e6f03b4c8df15c1966884 --- tools/recovery_l10n/res/values-ky/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ky/strings.xml b/tools/recovery_l10n/res/values-ky/strings.xml index d4083e46a..45fcd15e0 100644 --- a/tools/recovery_l10n/res/values-ky/strings.xml +++ b/tools/recovery_l10n/res/values-ky/strings.xml @@ -1,11 +1,11 @@ - "Системанын жаңыртуусу орнотулууда" + "Тутум жаңырууда" "Тазаланууда" "Буйрук берилген жок" "Ката!" - "Коопсуздук жаңыртуусу орнотулууда" + "Коопсуздук жаңырууда" "Android системасы жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек." "Кайталоо" "Кайра башынан жөндөө" -- cgit v1.2.3 From fb76d982a7eaa377088c19e4c5a24db637a22cf4 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 3 Mar 2021 18:46:23 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I03ef1d57f6bfcfa6f01b06355adbdf629f83b190 --- tools/recovery_l10n/res/values-ky/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ky/strings.xml b/tools/recovery_l10n/res/values-ky/strings.xml index d4083e46a..45fcd15e0 100644 --- a/tools/recovery_l10n/res/values-ky/strings.xml +++ b/tools/recovery_l10n/res/values-ky/strings.xml @@ -1,11 +1,11 @@ - "Системанын жаңыртуусу орнотулууда" + "Тутум жаңырууда" "Тазаланууда" "Буйрук берилген жок" "Ката!" - "Коопсуздук жаңыртуусу орнотулууда" + "Коопсуздук жаңырууда" "Android системасы жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек." "Кайталоо" "Кайра башынан жөндөө" -- cgit v1.2.3 From 8929f899ac6e07fd625670c66964eacbce3a81d1 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 31 Mar 2021 06:34:18 +0000 Subject: Revert "Update ImageGenerator to match the latest font names." This reverts commit 0a4e8283574dcf1b0df6f1db4f6a32da45c046e8. Reason for revert: font file name requirement has removed. Change-Id: I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3 --- tools/image_generator/ImageGenerator.java | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 8cc40c6b5..6c5ea4b5f 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -113,33 +113,33 @@ public class ImageGenerator { private static final Map LANGUAGE_TO_FONT_MAP = new TreeMap() { { - put("am", "NotoSansEthiopic-Regular"); - put("ar", "NotoNaskhArabicUI"); - put("as", "NotoSansBengaliUI-Regular"); - put("bn", "NotoSansBengaliUI-Regular"); - put("fa", "NotoNaskhArabicUI"); - put("gu", "NotoSansGujaratiUI"); - put("hi", "NotoSansDevanagariUI-Regular"); - put("hy", "NotoSansArmenian-Regular"); - put("iw", "NotoSansHebrew"); - put("ja", "NotoSansCJKjp-Regular"); - put("ka", "NotoSansGeorgian-Regular"); - put("ko", "NotoSansCJKjp-Regular"); - put("km", "NotoSansKhmerUI"); - put("kn", "NotoSansKannadaUI-Regular"); - put("lo", "NotoSansLaoUI"); - put("ml", "NotoSansMalayalamUI-Regular"); - put("mr", "NotoSansDevanagariUI-Regular"); + put("am", "NotoSansEthiopic-VF"); + put("ar", "NotoNaskhArabicUI-Regular"); + put("as", "NotoSansBengaliUI-VF"); + put("bn", "NotoSansBengaliUI-VF"); + put("fa", "NotoNaskhArabicUI-Regular"); + put("gu", "NotoSansGujaratiUI-Regular"); + put("hi", "NotoSansDevanagariUI-VF"); + put("hy", "NotoSansArmenian-VF"); + put("iw", "NotoSansHebrew-Regular"); + put("ja", "NotoSansCJK-Regular"); + put("ka", "NotoSansGeorgian-VF"); + put("ko", "NotoSansCJK-Regular"); + put("km", "NotoSansKhmerUI-Regular"); + put("kn", "NotoSansKannadaUI-VF"); + put("lo", "NotoSansLaoUI-Regular"); + put("ml", "NotoSansMalayalamUI-VF"); + put("mr", "NotoSansDevanagariUI-VF"); put("my", "NotoSansMyanmarUI-Regular"); - put("ne", "NotoSansDevanagariUI-Regular"); - put("or", "NotoSansOriya"); - put("pa", "NotoSansGurmukhiUI-Regular"); - put("si", "NotoSansSinhalaUI-Regular"); - put("ta", "NotoSansTamilUI-Regular"); - put("te", "NotoSansTeluguUI-Regular"); - put("th", "NotoSansThaiUI"); - put("ur", "NotoNaskhArabicUI"); - put("zh", "NotoSansCJKjp-Regular"); + put("ne", "NotoSansDevanagariUI-VF"); + put("or", "NotoSansOriya-Regular"); + put("pa", "NotoSansGurmukhiUI-VF"); + put("si", "NotoSansSinhalaUI-VF"); + put("ta", "NotoSansTamilUI-VF"); + put("te", "NotoSansTeluguUI-VF"); + put("th", "NotoSansThaiUI-Regular"); + put("ur", "NotoNaskhArabicUI-Regular"); + put("zh", "NotoSansCJK-Regular"); } }; @@ -386,7 +386,7 @@ public class ImageGenerator { } String fontName = LANGUAGE_TO_FONT_MAP.getOrDefault(language, DEFAULT_FONT_NAME); - String[] suffixes = {".otf", ".ttf", ".ttc", ".otc"}; + String[] suffixes = {".otf", ".ttf", ".ttc"}; for (String suffix : suffixes) { File fontFile = new File(mFontDirPath, fontName + suffix); if (fontFile.isFile()) { -- cgit v1.2.3 From 44acb4b964816dfdbeedef1159f314919ca2e41f Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 31 Mar 2021 14:31:08 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I8c748991e3e86d9892155c303c0ded675dfbef4f --- tools/recovery_l10n/res/values-iw/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-iw/strings.xml b/tools/recovery_l10n/res/values-iw/strings.xml index 8ca3bdf00..0b81d05c3 100644 --- a/tools/recovery_l10n/res/values-iw/strings.xml +++ b/tools/recovery_l10n/res/values-iw/strings.xml @@ -2,10 +2,10 @@ "מתקין עדכון מערכת" - "מוחק" + "מתבצעת מחיקה" "אין פקודה" "שגיאה!" - "מתקין עדכון אבטחה" + "התקנת עדכון אבטחה מתבצעת" "‏לא ניתן לטעון את מערכת Android. ייתכן שהנתונים שלך פגומים. אם הודעה זו תופיע שוב, ייתכן שיהיה עליך לבצע איפוס לנתוני היצרן ולמחוק את כל נתוני המשתמש ששמורים במכשיר זה." "ניסיון נוסף" "איפוס לנתוני היצרן" -- cgit v1.2.3 From 8e045405d1fd8eeb2ca4d7c454b5ea5bc1bb9375 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 5 Apr 2021 04:56:28 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Id1c247ae55b8ff5311ae07200b8b9f618cf53f3f --- tools/recovery_l10n/res/values-iw/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-iw/strings.xml b/tools/recovery_l10n/res/values-iw/strings.xml index 8ca3bdf00..0b81d05c3 100644 --- a/tools/recovery_l10n/res/values-iw/strings.xml +++ b/tools/recovery_l10n/res/values-iw/strings.xml @@ -2,10 +2,10 @@ "מתקין עדכון מערכת" - "מוחק" + "מתבצעת מחיקה" "אין פקודה" "שגיאה!" - "מתקין עדכון אבטחה" + "התקנת עדכון אבטחה מתבצעת" "‏לא ניתן לטעון את מערכת Android. ייתכן שהנתונים שלך פגומים. אם הודעה זו תופיע שוב, ייתכן שיהיה עליך לבצע איפוס לנתוני היצרן ולמחוק את כל נתוני המשתמש ששמורים במכשיר זה." "ניסיון נוסף" "איפוס לנתוני היצרן" -- cgit v1.2.3 From 2ec0b3b489944c1228e76b09d64980867d361f8d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 8 Apr 2021 23:36:47 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I2319c692bc7f1d457ece26843bc660bce027f21d --- tools/recovery_l10n/res/values-az/strings.xml | 2 +- tools/recovery_l10n/res/values-fi/strings.xml | 2 +- tools/recovery_l10n/res/values-ne/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/recovery_l10n/res/values-az/strings.xml b/tools/recovery_l10n/res/values-az/strings.xml index 35194c4b2..d624e6356 100644 --- a/tools/recovery_l10n/res/values-az/strings.xml +++ b/tools/recovery_l10n/res/values-az/strings.xml @@ -5,7 +5,7 @@ "Silinir" "Əmr yoxdur" "Xəta!" - "Təhlükəsizlik güncəlləməsi yüklənir" + "Güvənlik güncəllənməsi quraşdırılır" "Android sistemi yüklənmir. Datanız zədələnə bilər. Bu mesajı yenə qəbul etsəniz, data zavod sıfırlamasını həyata keçirməli və bu cihazda saxlanmış istifadəçi datasının hamısını silməlisiniz." "Yenidən cəhd edin" "Data zavod sıfırlaması" diff --git a/tools/recovery_l10n/res/values-fi/strings.xml b/tools/recovery_l10n/res/values-fi/strings.xml index fddaf1453..e82578358 100644 --- a/tools/recovery_l10n/res/values-fi/strings.xml +++ b/tools/recovery_l10n/res/values-fi/strings.xml @@ -10,5 +10,5 @@ "Yritä uudelleen" "Tehdasasetuksien palauttaminen" "Poistetaanko kaikki käyttäjätiedot?\n\nTÄTÄ EI VOI PERUA!" - "Peruuta" + "Peru" diff --git a/tools/recovery_l10n/res/values-ne/strings.xml b/tools/recovery_l10n/res/values-ne/strings.xml index fa53e9dae..161d1e459 100644 --- a/tools/recovery_l10n/res/values-ne/strings.xml +++ b/tools/recovery_l10n/res/values-ne/strings.xml @@ -6,7 +6,7 @@ "कुनै आदेश छैन" "त्रुटि!" "सुरक्षा सम्बन्धी अद्यावधिकलाई स्थापना गर्दै" - "Android प्रणाली लोड गर्न सकिएन। तपाईंको डेटा बिग्रेको हुन सक्छ। तपाईं यो सन्देश प्राप्त गर्नुहुन्छ भने तपाईंले फ्याक्ट्री डेटा रिसेट गर्न आवश्यक छ र यो यन्त्रमा भण्डारण गरेका सबै प्रयोगकर्ताको डेटा मेट्न पर्छ।" + "Android प्रणाली लोड गर्न सकिएन। तपाईंको डेटा बिग्रेको हुन सक्छ। तपाईं यो सन्देश प्राप्त गर्नुहुन्छ भने तपाईंले फ्याक्ट्री डेटा रिसेट गर्न आवश्यक छ र यो डिभाइसमा भण्डारण गरेका सबै प्रयोगकर्ताको डेटा मेट्न पर्छ।" "फेरि प्रयास गर्नुहोस्" "फ्याक्ट्री डेटा रिसेट" "प्रयोगकर्ताको सबै डेटा मेट्ने हो?\n\n यो अन्डू गर्न सकिँदैन!" -- cgit v1.2.3 From 0c955dd484af999e20da5f66d938a672144d4598 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 15 Apr 2021 21:36:47 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I5cc773de7c06c6a4d6aec2498e39c5c3633b6dd5 --- tools/recovery_l10n/res/values-az/strings.xml | 2 +- tools/recovery_l10n/res/values-fi/strings.xml | 2 +- tools/recovery_l10n/res/values-ne/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/recovery_l10n/res/values-az/strings.xml b/tools/recovery_l10n/res/values-az/strings.xml index 35194c4b2..d624e6356 100644 --- a/tools/recovery_l10n/res/values-az/strings.xml +++ b/tools/recovery_l10n/res/values-az/strings.xml @@ -5,7 +5,7 @@ "Silinir" "Əmr yoxdur" "Xəta!" - "Təhlükəsizlik güncəlləməsi yüklənir" + "Güvənlik güncəllənməsi quraşdırılır" "Android sistemi yüklənmir. Datanız zədələnə bilər. Bu mesajı yenə qəbul etsəniz, data zavod sıfırlamasını həyata keçirməli və bu cihazda saxlanmış istifadəçi datasının hamısını silməlisiniz." "Yenidən cəhd edin" "Data zavod sıfırlaması" diff --git a/tools/recovery_l10n/res/values-fi/strings.xml b/tools/recovery_l10n/res/values-fi/strings.xml index fddaf1453..e82578358 100644 --- a/tools/recovery_l10n/res/values-fi/strings.xml +++ b/tools/recovery_l10n/res/values-fi/strings.xml @@ -10,5 +10,5 @@ "Yritä uudelleen" "Tehdasasetuksien palauttaminen" "Poistetaanko kaikki käyttäjätiedot?\n\nTÄTÄ EI VOI PERUA!" - "Peruuta" + "Peru" diff --git a/tools/recovery_l10n/res/values-ne/strings.xml b/tools/recovery_l10n/res/values-ne/strings.xml index fa53e9dae..161d1e459 100644 --- a/tools/recovery_l10n/res/values-ne/strings.xml +++ b/tools/recovery_l10n/res/values-ne/strings.xml @@ -6,7 +6,7 @@ "कुनै आदेश छैन" "त्रुटि!" "सुरक्षा सम्बन्धी अद्यावधिकलाई स्थापना गर्दै" - "Android प्रणाली लोड गर्न सकिएन। तपाईंको डेटा बिग्रेको हुन सक्छ। तपाईं यो सन्देश प्राप्त गर्नुहुन्छ भने तपाईंले फ्याक्ट्री डेटा रिसेट गर्न आवश्यक छ र यो यन्त्रमा भण्डारण गरेका सबै प्रयोगकर्ताको डेटा मेट्न पर्छ।" + "Android प्रणाली लोड गर्न सकिएन। तपाईंको डेटा बिग्रेको हुन सक्छ। तपाईं यो सन्देश प्राप्त गर्नुहुन्छ भने तपाईंले फ्याक्ट्री डेटा रिसेट गर्न आवश्यक छ र यो डिभाइसमा भण्डारण गरेका सबै प्रयोगकर्ताको डेटा मेट्न पर्छ।" "फेरि प्रयास गर्नुहोस्" "फ्याक्ट्री डेटा रिसेट" "प्रयोगकर्ताको सबै डेटा मेट्ने हो?\n\n यो अन्डू गर्न सकिँदैन!" -- cgit v1.2.3 From b0c2d264f6572f8cbe264d859a377f443cc20576 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 19 Apr 2021 19:51:27 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ibab2c8b52e7c6908935fee7de18d0be0d0184733 --- tools/recovery_l10n/res/values-fa/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-fa/strings.xml b/tools/recovery_l10n/res/values-fa/strings.xml index 1c1be9ae3..7e1dbe7b1 100644 --- a/tools/recovery_l10n/res/values-fa/strings.xml +++ b/tools/recovery_l10n/res/values-fa/strings.xml @@ -9,6 +9,6 @@ "‏نمی‌توان سیستم Android را بارگیری کرد. ممکن است داده‌های شما خراب باشند. اگر همچنان این پیام را دریافت می‌کنید، شاید لازم باشد بازنشانی داده‌های کارخانه‌ای انجام دهید و همه داده‌های کاربر را که در این دستگاه ذخیره شده است پاک کنید." "تلاش مجدد" "بازنشانی داده‌های کارخانه" - "همه داده‌های کاربر پاک شود؟\n\n این کار قابل‌واگرد نیست!" + "همه داده‌های کاربر محو شود؟\n\n این کار واگردشدنی نیست!" "لغو" -- cgit v1.2.3 From 488f7664abb2ea134c682f8d174a17f93674ab62 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 19 Apr 2021 19:52:41 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ibf0801f85dee0f2009f3864f78e2534c24276676 --- tools/recovery_l10n/res/values-az/strings.xml | 2 +- tools/recovery_l10n/res/values-fa/strings.xml | 2 +- tools/recovery_l10n/res/values-fi/strings.xml | 2 +- tools/recovery_l10n/res/values-ne/strings.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/recovery_l10n/res/values-az/strings.xml b/tools/recovery_l10n/res/values-az/strings.xml index 35194c4b2..d624e6356 100644 --- a/tools/recovery_l10n/res/values-az/strings.xml +++ b/tools/recovery_l10n/res/values-az/strings.xml @@ -5,7 +5,7 @@ "Silinir" "Əmr yoxdur" "Xəta!" - "Təhlükəsizlik güncəlləməsi yüklənir" + "Güvənlik güncəllənməsi quraşdırılır" "Android sistemi yüklənmir. Datanız zədələnə bilər. Bu mesajı yenə qəbul etsəniz, data zavod sıfırlamasını həyata keçirməli və bu cihazda saxlanmış istifadəçi datasının hamısını silməlisiniz." "Yenidən cəhd edin" "Data zavod sıfırlaması" diff --git a/tools/recovery_l10n/res/values-fa/strings.xml b/tools/recovery_l10n/res/values-fa/strings.xml index 1c1be9ae3..7e1dbe7b1 100644 --- a/tools/recovery_l10n/res/values-fa/strings.xml +++ b/tools/recovery_l10n/res/values-fa/strings.xml @@ -9,6 +9,6 @@ "‏نمی‌توان سیستم Android را بارگیری کرد. ممکن است داده‌های شما خراب باشند. اگر همچنان این پیام را دریافت می‌کنید، شاید لازم باشد بازنشانی داده‌های کارخانه‌ای انجام دهید و همه داده‌های کاربر را که در این دستگاه ذخیره شده است پاک کنید." "تلاش مجدد" "بازنشانی داده‌های کارخانه" - "همه داده‌های کاربر پاک شود؟\n\n این کار قابل‌واگرد نیست!" + "همه داده‌های کاربر محو شود؟\n\n این کار واگردشدنی نیست!" "لغو" diff --git a/tools/recovery_l10n/res/values-fi/strings.xml b/tools/recovery_l10n/res/values-fi/strings.xml index fddaf1453..e82578358 100644 --- a/tools/recovery_l10n/res/values-fi/strings.xml +++ b/tools/recovery_l10n/res/values-fi/strings.xml @@ -10,5 +10,5 @@ "Yritä uudelleen" "Tehdasasetuksien palauttaminen" "Poistetaanko kaikki käyttäjätiedot?\n\nTÄTÄ EI VOI PERUA!" - "Peruuta" + "Peru" diff --git a/tools/recovery_l10n/res/values-ne/strings.xml b/tools/recovery_l10n/res/values-ne/strings.xml index fa53e9dae..161d1e459 100644 --- a/tools/recovery_l10n/res/values-ne/strings.xml +++ b/tools/recovery_l10n/res/values-ne/strings.xml @@ -6,7 +6,7 @@ "कुनै आदेश छैन" "त्रुटि!" "सुरक्षा सम्बन्धी अद्यावधिकलाई स्थापना गर्दै" - "Android प्रणाली लोड गर्न सकिएन। तपाईंको डेटा बिग्रेको हुन सक्छ। तपाईं यो सन्देश प्राप्त गर्नुहुन्छ भने तपाईंले फ्याक्ट्री डेटा रिसेट गर्न आवश्यक छ र यो यन्त्रमा भण्डारण गरेका सबै प्रयोगकर्ताको डेटा मेट्न पर्छ।" + "Android प्रणाली लोड गर्न सकिएन। तपाईंको डेटा बिग्रेको हुन सक्छ। तपाईं यो सन्देश प्राप्त गर्नुहुन्छ भने तपाईंले फ्याक्ट्री डेटा रिसेट गर्न आवश्यक छ र यो डिभाइसमा भण्डारण गरेका सबै प्रयोगकर्ताको डेटा मेट्न पर्छ।" "फेरि प्रयास गर्नुहोस्" "फ्याक्ट्री डेटा रिसेट" "प्रयोगकर्ताको सबै डेटा मेट्ने हो?\n\n यो अन्डू गर्न सकिँदैन!" -- cgit v1.2.3 From 00874ceb73f7e8cafec3461840ae48da35e7e797 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 19 Apr 2021 19:55:21 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I60b8d46e36b46008493de2e451d3182787109775 --- tools/recovery_l10n/res/values-fa/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-fa/strings.xml b/tools/recovery_l10n/res/values-fa/strings.xml index 1c1be9ae3..7e1dbe7b1 100644 --- a/tools/recovery_l10n/res/values-fa/strings.xml +++ b/tools/recovery_l10n/res/values-fa/strings.xml @@ -9,6 +9,6 @@ "‏نمی‌توان سیستم Android را بارگیری کرد. ممکن است داده‌های شما خراب باشند. اگر همچنان این پیام را دریافت می‌کنید، شاید لازم باشد بازنشانی داده‌های کارخانه‌ای انجام دهید و همه داده‌های کاربر را که در این دستگاه ذخیره شده است پاک کنید." "تلاش مجدد" "بازنشانی داده‌های کارخانه" - "همه داده‌های کاربر پاک شود؟\n\n این کار قابل‌واگرد نیست!" + "همه داده‌های کاربر محو شود؟\n\n این کار واگردشدنی نیست!" "لغو" -- cgit v1.2.3 From a0dc131542597fabae6b452903ff3edeea02ef8a Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 7 May 2021 15:54:13 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I4a3fe4b3e8b9260c03caf5c9391eda4d9d7c67f0 --- tools/recovery_l10n/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-sv/strings.xml b/tools/recovery_l10n/res/values-sv/strings.xml index cf43b2511..baf8e1830 100644 --- a/tools/recovery_l10n/res/values-sv/strings.xml +++ b/tools/recovery_l10n/res/values-sv/strings.xml @@ -2,7 +2,7 @@ "Systemuppdatering installeras" - "Rensar" + "Raderar" "Inget kommando" "Fel!" "Säkerhetsuppdatering installeras" -- cgit v1.2.3 From 25491dc36846fa5f72edbb781fa5ae737467629d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 7 May 2021 15:55:27 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I18f34fb71130d5bd2959ccc4f82959dffb58dedf --- tools/recovery_l10n/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-sv/strings.xml b/tools/recovery_l10n/res/values-sv/strings.xml index cf43b2511..baf8e1830 100644 --- a/tools/recovery_l10n/res/values-sv/strings.xml +++ b/tools/recovery_l10n/res/values-sv/strings.xml @@ -2,7 +2,7 @@ "Systemuppdatering installeras" - "Rensar" + "Raderar" "Inget kommando" "Fel!" "Säkerhetsuppdatering installeras" -- cgit v1.2.3 From 48a7e7dd7b5c50249e6507499f014c9616221433 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 8 May 2021 18:49:48 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I1cda13316ca0951ffc5eef1170aed2595b7c2dca --- tools/recovery_l10n/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-sv/strings.xml b/tools/recovery_l10n/res/values-sv/strings.xml index cf43b2511..baf8e1830 100644 --- a/tools/recovery_l10n/res/values-sv/strings.xml +++ b/tools/recovery_l10n/res/values-sv/strings.xml @@ -2,7 +2,7 @@ "Systemuppdatering installeras" - "Rensar" + "Raderar" "Inget kommando" "Fel!" "Säkerhetsuppdatering installeras" -- cgit v1.2.3 From e63122520489f969280db2725fabd580def4f97c Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Fri, 14 May 2021 17:15:50 -0400 Subject: Check SPL downgrade before install OTA in recovery Applying an SPL downgrade package can cause boot failures (/data failed to decrypt). Today's ota_from_target_files tool already try to prevent this. But Packages generated using older tools are still around. Add check in recovery to prevent such OTA package from installing. Test: th Test: Sideload an OTA with newer SPL, make sure check passes Test; Sideload an OTA with older SPL, make sure check fails Bug: 186581246 Bug: 188575410 cherry-picked from aosp/1708986 cherry-picked from commit: 33c62fc4b81b93b29c7a94fba20ab56d7f5f6bd7 Change-Id: Icffe8097521c511e151af023a443ccbb4b59e22c --- install/Android.bp | 41 +++++++++++++++++++ install/include/install/spl_check.h | 26 +++++++++++++ install/install.cpp | 7 ++++ install/spl_check.cpp | 78 +++++++++++++++++++++++++++++++++++++ install/spl_check_unittests.cpp | 45 +++++++++++++++++++++ 5 files changed, 197 insertions(+) create mode 100644 install/include/install/spl_check.h create mode 100644 install/spl_check.cpp create mode 100644 install/spl_check_unittests.cpp diff --git a/install/Android.bp b/install/Android.bp index 8c88bd01e..e239ddc4e 100644 --- a/install/Android.bp +++ b/install/Android.bp @@ -26,6 +26,7 @@ cc_defaults { defaults: [ "recovery_defaults", + "libspl_check_defaults", ], shared_libs: [ @@ -49,12 +50,51 @@ cc_defaults { "librecovery_utils", "libotautil", "libsnapshot_nobinder", + "ota_metadata_proto_cc", // external dependencies "libvintf", ], } +cc_test_host { + name: "libinstall_host_unittests", + defaults: [ + "libspl_check_defaults" + ], + srcs: [ + "spl_check_unittests.cpp", + ], + static_libs: [ + "libspl_check", + ], +} + +cc_defaults { + name: "libspl_check_defaults", + static_libs: [ + "libbase", + "ota_metadata_proto_cc", + "liblog", + "libziparchive", + "libz", + "libprotobuf-cpp-lite", + ], +} + +cc_library_static { + name: "libspl_check", + recovery_available: true, + host_supported: true, + defaults: [ + "libspl_check_defaults", + ], + srcs: ["spl_check.cpp"], + export_include_dirs: [ + "include", + ], +} + cc_library_static { name: "libinstall", recovery_available: true, @@ -73,6 +113,7 @@ cc_library_static { "verifier.cpp", "wipe_data.cpp", "wipe_device.cpp", + "spl_check.cpp", ], header_libs: [ diff --git a/install/include/install/spl_check.h b/install/include/install/spl_check.h new file mode 100644 index 000000000..e0bfc62c7 --- /dev/null +++ b/install/include/install/spl_check.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include +#include +#include + +bool ViolatesSPLDowngrade(const build::tools::releasetools::OtaMetadata& metadata, + std::string_view current_spl); + +bool ViolatesSPLDowngrade(ZipArchiveHandle zip, std::string_view current_spl); diff --git a/install/install.cpp b/install/install.cpp index 1b220cb39..6e74f80ab 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -47,6 +47,7 @@ #include #include "install/package.h" +#include "install/spl_check.h" #include "install/verifier.h" #include "install/wipe_data.h" #include "otautil/error_code.h" @@ -348,6 +349,12 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, android::base::GetBoolProperty("ro.virtual_ab.allow_non_ab", false); bool device_only_supports_ab = device_supports_ab && !ab_device_supports_nonab; + const auto current_spl = android::base::GetProperty("ro.build.version.security_patch", ""); + if (ViolatesSPLDowngrade(zip, current_spl)) { + LOG(ERROR) << "Denying OTA because it's SPL downgrade"; + return INSTALL_ERROR; + } + if (package_is_ab) { CHECK(package->GetType() == PackageType::kFile); } diff --git a/install/spl_check.cpp b/install/spl_check.cpp new file mode 100644 index 000000000..c26ab82f6 --- /dev/null +++ b/install/spl_check.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "install/spl_check.h" + +bool ViolatesSPLDowngrade(const build::tools::releasetools::OtaMetadata& metadata, + std::string_view current_spl) { + const auto& post_spl = metadata.postcondition().security_patch_level(); + if (current_spl.empty()) { + LOG(WARNING) << "Failed to get device's current security patch level. Target SPL is " + << post_spl << " permitting OTA install"; + return false; + } + // SPL(security patch level) is expected to be in format yyyy-mm-dd, e.g. 2018-05-29. Given this + // specific format, comparing two SPL can be done by just regular string comparison. If the format + // must lay out year/month/date in the exact order, and must properly prepend dates with 0(for + // example, 05 for May). Otherwise this comparison doesn't work. We don't expect SPL date formats + // to change, leave this as is. + if (post_spl < current_spl) { + LOG(ERROR) << "Current SPL: " << current_spl << " Target SPL: " << post_spl + << " this is considered a downgrade"; + if (metadata.spl_downgrade() || metadata.downgrade()) { + LOG(WARNING) + << "SPL downgrade detected, but OTA package explicitly permitts this(OtaMetadata has " + "spl_downgrade / downgrade bit set).Permitting update anyway.Installing a SPL " + "downgrade OTA can cause /data fail to decrypt and device fails to boot."; + return false; + } + return true; + } else { + LOG(INFO) << "old spl: " << current_spl << " new spl: " << post_spl << " CHECK passes"; + } + return false; +} + +bool ViolatesSPLDowngrade(ZipArchiveHandle zip, std::string_view current_spl) { + static constexpr auto&& OTA_OTA_METADATA = "META-INF/com/android/metadata.pb"; + ZipEntry64 metadata_entry; + if (FindEntry(zip, OTA_OTA_METADATA, &metadata_entry) != 0) { + LOG(WARNING) << "Failed to find " << OTA_OTA_METADATA + << " treating this as non-spl-downgrade, permit OTA install. If device bricks " + "after installing, check kernel log to see if /data failed to decrypt"; + return false; + } + const auto metadata_entry_length = metadata_entry.uncompressed_length; + if (metadata_entry_length > std::numeric_limits::max()) { + LOG(ERROR) << "Failed to extract " << OTA_OTA_METADATA + << " because's uncompressed size exceeds size of address space. " + << metadata_entry_length; + return false; + } + std::vector ota_metadata(metadata_entry_length); + int32_t err = ExtractToMemory(zip, &metadata_entry, ota_metadata.data(), metadata_entry_length); + if (err != 0) { + LOG(ERROR) << "Failed to extract " << OTA_OTA_METADATA << ": " << ErrorCodeString(err); + return false; + } + using build::tools::releasetools::OtaMetadata; + OtaMetadata metadata; + if (!metadata.ParseFromArray(ota_metadata.data(), ota_metadata.size())) { + LOG(ERROR) << "Failed to parse ota_medata"; + return false; + } + return ViolatesSPLDowngrade(metadata, current_spl); +} diff --git a/install/spl_check_unittests.cpp b/install/spl_check_unittests.cpp new file mode 100644 index 000000000..709b69c9f --- /dev/null +++ b/install/spl_check_unittests.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include "install/spl_check.h" +#include "ota_metadata.pb.h" + +using build::tools::releasetools::OtaMetadata; +class SplCheckUnittest : public ::testing::Test { + public: + OtaMetadata metadata; +}; + +TEST_F(SplCheckUnittest, OlderSPL) { + metadata.set_spl_downgrade(false); + metadata.mutable_postcondition()->set_security_patch_level("2021-04-25"); + ASSERT_TRUE(ViolatesSPLDowngrade(metadata, "2021-05-01")); +} + +TEST_F(SplCheckUnittest, NewerSPL) { + metadata.set_spl_downgrade(false); + metadata.mutable_postcondition()->set_security_patch_level("2021-06-01"); + ASSERT_FALSE(ViolatesSPLDowngrade(metadata, "2021-05-05")); +} + +TEST_F(SplCheckUnittest, OlderSPLPermit) { + // If spl_downgrade is set to true, OTA should be permitted + metadata.set_spl_downgrade(true); + metadata.mutable_postcondition()->set_security_patch_level("2021-04-11"); + ASSERT_FALSE(ViolatesSPLDowngrade(metadata, "2021-05-11")); +} \ No newline at end of file -- cgit v1.2.3 From 64898ea3f9a7d0c64f21c6ad4a6082dcd7a23026 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 2 Jul 2021 22:50:35 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I007c5387105b2839a4f31581e58800cd3ece07a2 --- tools/recovery_l10n/res/values-kn/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-kn/strings.xml b/tools/recovery_l10n/res/values-kn/strings.xml index a98f4692a..eafd831e7 100644 --- a/tools/recovery_l10n/res/values-kn/strings.xml +++ b/tools/recovery_l10n/res/values-kn/strings.xml @@ -8,7 +8,7 @@ "ಭದ್ರತೆಯ ಅಪ್‌ಡೇಟ್‌ ಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ" "Android ಸಿಸ್ಟಂ ಅನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಿಮ್ಮ ಡೇಟಾ ದೋಷಪೂರಿತವಾಗಿರಬಹುದು. ನೀವು ಈ ಸಂದೇಶ ಪಡೆಯುವುದು ಮುಂದುವರಿದರೆ, ನೀವು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರಿಸೆಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ ಮತ್ತು ಈ ಸಾಧನದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾದ ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸಬೇಕಾಗುತ್ತದೆ." "ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ" - "ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರಿಸೆಟ್‌" + "ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್" "ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸುವುದೇ?\n\n ಇದನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!" "ರದ್ದುಮಾಡಿ" -- cgit v1.2.3 From 6e679e577369298b3a80f3937bc25748aca07352 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 2 Jul 2021 22:53:03 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I84b147a52db1507ba1351c768b740d05265d7ce0 --- tools/recovery_l10n/res/values-kn/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-kn/strings.xml b/tools/recovery_l10n/res/values-kn/strings.xml index a98f4692a..eafd831e7 100644 --- a/tools/recovery_l10n/res/values-kn/strings.xml +++ b/tools/recovery_l10n/res/values-kn/strings.xml @@ -8,7 +8,7 @@ "ಭದ್ರತೆಯ ಅಪ್‌ಡೇಟ್‌ ಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ" "Android ಸಿಸ್ಟಂ ಅನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಿಮ್ಮ ಡೇಟಾ ದೋಷಪೂರಿತವಾಗಿರಬಹುದು. ನೀವು ಈ ಸಂದೇಶ ಪಡೆಯುವುದು ಮುಂದುವರಿದರೆ, ನೀವು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರಿಸೆಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ ಮತ್ತು ಈ ಸಾಧನದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾದ ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸಬೇಕಾಗುತ್ತದೆ." "ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ" - "ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರಿಸೆಟ್‌" + "ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್" "ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸುವುದೇ?\n\n ಇದನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!" "ರದ್ದುಮಾಡಿ" -- cgit v1.2.3 From 42c11d9b870d075408b55795a66ccd42a63b5dec Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 2 Jul 2021 22:55:28 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I615873a60232a720aed242972af03014967b3bdf --- tools/recovery_l10n/res/values-kn/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-kn/strings.xml b/tools/recovery_l10n/res/values-kn/strings.xml index a98f4692a..eafd831e7 100644 --- a/tools/recovery_l10n/res/values-kn/strings.xml +++ b/tools/recovery_l10n/res/values-kn/strings.xml @@ -8,7 +8,7 @@ "ಭದ್ರತೆಯ ಅಪ್‌ಡೇಟ್‌ ಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ" "Android ಸಿಸ್ಟಂ ಅನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಿಮ್ಮ ಡೇಟಾ ದೋಷಪೂರಿತವಾಗಿರಬಹುದು. ನೀವು ಈ ಸಂದೇಶ ಪಡೆಯುವುದು ಮುಂದುವರಿದರೆ, ನೀವು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರಿಸೆಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ ಮತ್ತು ಈ ಸಾಧನದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾದ ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸಬೇಕಾಗುತ್ತದೆ." "ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ" - "ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರಿಸೆಟ್‌" + "ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್" "ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸುವುದೇ?\n\n ಇದನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!" "ರದ್ದುಮಾಡಿ" -- cgit v1.2.3 From 29ec9925ccad498122d5fc3d0e39dc87920c923c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 7 Aug 2021 12:42:28 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I425118cca58bc33674b8c7cbe09f23fb3723cea7 --- tools/recovery_l10n/res/values-te/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index 4d521143f..794752cd7 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -1,11 +1,11 @@ - "సిస్టమ్ నవీకరణను ఇన్‍స్టాల్ చేస్తోంది" + "సిస్టమ్ అప్‌డేట్‌ను ఇన్‍స్టాల్ చేస్తోంది" "డేటాను తొలగిస్తోంది" "ఆదేశం లేదు" "ఎర్రర్ సంభవించింది!" - "భద్రతా నవీకరణను ఇన్‌స్టాల్ చేస్తోంది" + "భద్రతా అప్‌డేట్‌ను ఇన్‌స్టాల్ చేస్తోంది" "Android సిస్టమ్‌ని లోడ్ చేయడం సాధ్యం కాదు. మీ డేటా పాడై ఉండవచ్చు. మీకు ఈ సందేశం వస్తూనే ఉంటే, మీరు ఫ్యాక్టరీ డేటా రీసెట్ చేసి, పరికరంలో నిల్వ అయిన వినియోగదారు డేటా మొత్తాన్ని తొలగించాల్సి రావచ్చు." "మళ్లీ ప్రయత్నించు" "ఫ్యాక్టరీ డేటా రీసెట్" -- cgit v1.2.3 From 3c18472cf1cb8949e27a715d8e1d1b32070ca03d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 7 Aug 2021 12:47:20 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Id27881b4f8ba0ae1e74f8bc8db0320d48f678068 --- tools/recovery_l10n/res/values-te/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index 4d521143f..794752cd7 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -1,11 +1,11 @@ - "సిస్టమ్ నవీకరణను ఇన్‍స్టాల్ చేస్తోంది" + "సిస్టమ్ అప్‌డేట్‌ను ఇన్‍స్టాల్ చేస్తోంది" "డేటాను తొలగిస్తోంది" "ఆదేశం లేదు" "ఎర్రర్ సంభవించింది!" - "భద్రతా నవీకరణను ఇన్‌స్టాల్ చేస్తోంది" + "భద్రతా అప్‌డేట్‌ను ఇన్‌స్టాల్ చేస్తోంది" "Android సిస్టమ్‌ని లోడ్ చేయడం సాధ్యం కాదు. మీ డేటా పాడై ఉండవచ్చు. మీకు ఈ సందేశం వస్తూనే ఉంటే, మీరు ఫ్యాక్టరీ డేటా రీసెట్ చేసి, పరికరంలో నిల్వ అయిన వినియోగదారు డేటా మొత్తాన్ని తొలగించాల్సి రావచ్చు." "మళ్లీ ప్రయత్నించు" "ఫ్యాక్టరీ డేటా రీసెట్" -- cgit v1.2.3 From e597faf178229c46017ab9d9875d59c70835d201 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 10 Aug 2021 13:26:16 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I863ac592a537a997999b3cc5d9bddb4dbae34fd8 --- tools/recovery_l10n/res/values-te/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index 4d521143f..794752cd7 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -1,11 +1,11 @@ - "సిస్టమ్ నవీకరణను ఇన్‍స్టాల్ చేస్తోంది" + "సిస్టమ్ అప్‌డేట్‌ను ఇన్‍స్టాల్ చేస్తోంది" "డేటాను తొలగిస్తోంది" "ఆదేశం లేదు" "ఎర్రర్ సంభవించింది!" - "భద్రతా నవీకరణను ఇన్‌స్టాల్ చేస్తోంది" + "భద్రతా అప్‌డేట్‌ను ఇన్‌స్టాల్ చేస్తోంది" "Android సిస్టమ్‌ని లోడ్ చేయడం సాధ్యం కాదు. మీ డేటా పాడై ఉండవచ్చు. మీకు ఈ సందేశం వస్తూనే ఉంటే, మీరు ఫ్యాక్టరీ డేటా రీసెట్ చేసి, పరికరంలో నిల్వ అయిన వినియోగదారు డేటా మొత్తాన్ని తొలగించాల్సి రావచ్చు." "మళ్లీ ప్రయత్నించు" "ఫ్యాక్టరీ డేటా రీసెట్" -- cgit v1.2.3