Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18856fad authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR2 to AOSP main 

Bug: 319669529
Merged-In: Id2a5e2bbed3c6327ec5694a2ee3a696f4eec197b
Change-Id: I4d532b1c819db30c717b3611e90fadd5c43e13b2
parents 9cdf5eef 72dc9496

TEST_MAPPING

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
      "name": "BluetoothInstrumentationTests"

    },

    {

      "name": "GoogleBluetoothInstrumentationTests"

      "name": "GoogleBluetoothInstrumentationTests",

      "keywords": ["internal"]

    },

    {

      "name": "FrameworkBluetoothTests"

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ android_app { 
        "framework-bluetooth-pre-jarjar",

        "framework-configinfrastructure",

        "framework-connectivity.stubs.module_lib",

        "framework-location.stubs.module_lib",

        "framework-mediaprovider",

        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

android/app/res/values-af/strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="2326164424236203271">"Bluetooth"</string>

    <string name="permlab_bluetoothShareManager" msgid="5297865456717871041">"Maak toegang aflaaibestuurder oop."</string>

    <string name="permdesc_bluetoothShareManager" msgid="1588034776955941477">"Gee aan die program toegang tot die BluetoothShare-bestuurder en om dit te gebruik om lêers oor te dra."</string>

    <string name="permlab_bluetoothAcceptlist" msgid="5785922051395856524">"Voeg Bluetooth-toesteltoegang by aanvaarlys."</string>
@@ -130,9 +131,9 @@ 
    <string name="bluetooth_opp_file_limit_exceeded" msgid="6612109860149473930">"Lêers groter as 4 GB kan nie oorgedra word nie"</string>

    <string name="bluetooth_connect_action" msgid="2319449093046720209">"Koppel aan Bluetooth"</string>

    <string name="bluetooth_enabled_apm_title" msgid="6914461147844949044">"Bluetooth is aan in vliegtuigmodus"</string>

    <string name="bluetooth_enabled_apm_message" msgid="8409900562494838113">"As jy Bluetooth aangeskakel hou, sal jou foon onthou om dit aan te hou wanneer jy weer in vliegtuigmodus is"</string>

    <string name="bluetooth_enabled_apm_message" msgid="6168686193308136881">"As jy Bluetooth aangeskakel hou, sal jou toestel onthou om dit aan te hou wanneer jy weer in vliegtuigmodus is"</string>

    <string name="bluetooth_stays_on_title" msgid="39720820955212918">"Bluetooth bly aan"</string>

    <string name="bluetooth_stays_on_message" msgid="7142453371222249965">"Jou foon onthou om Bluetooth aangeskakel te hou in vliegtuigmodus. Skakel Bluetooth af as jy nie wil hê dit moet aan bly nie."</string>

    <string name="bluetooth_stays_on_message" msgid="3669663452593157737">"Jou toestel onthou om Bluetooth aan te hou in vliegtuigmodus. Skakel Bluetooth af as jy nie wil hê dit moet aan bly nie."</string>

    <string name="bluetooth_and_wifi_stays_on_title" msgid="5821932798860821244">"Wi-fi en Bluetooth bly aan"</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="2390749828997719812">"Jou foon onthou om wi‑fi en Bluetooth aan te hou in vliegtuigmodus. Skakel wi-fi en Bluetooth af as jy nie wil het hulle moet aan bly nie."</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="7848565203843882558">"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."</string>

</resources>

android/app/res/values-af/strings_pbap.xml

+2 −0
Original line number Diff line number Diff line
@@ -13,4 +13,6 @@ 
    <string name="localPhoneName" msgid="9119254982537191352">"My naam"</string>

    <string name="defaultnumber" msgid="5348816189286607406">"000000"</string>

    <string name="pbap_notification_group" msgid="4215789331721465381">"Bluetooth-kontakdeling"</string>

    <string name="phonebook_advance_feature_support" msgid="8129553051734505128">"Foonboek se gevorderde kenmerk word gesteun"</string>

    <string name="repair_for_adv_phonebook_feature" msgid="3489797973131684927">"Bind weer saam met Foonboek se gevorderde kenmerk"</string>

</resources>

android/app/res/values-am/strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="2326164424236203271">"ብሉቱዝ"</string>

    <string name="permlab_bluetoothShareManager" msgid="5297865456717871041">"አውርድ አደራጅን ድረስ።"</string>

    <string name="permdesc_bluetoothShareManager" msgid="1588034776955941477">"የብሉቱዝ አጋራ አስተዳዳሪውን ለመድረስ እና ፋይሎች እንዲያስተላልፉ ለመጠቀም ለመተግበሪያው ይፈቅዳል።"</string>

    <string name="permlab_bluetoothAcceptlist" msgid="5785922051395856524">"የብሉቱዝ መሣሪያ መዳረሻን በመቀበያ ዝርዝር ያስገቡ።"</string>
@@ -130,9 +131,9 @@ 
    <string name="bluetooth_opp_file_limit_exceeded" msgid="6612109860149473930">"ከ4 ጊባ በላይ የሆኑ ፋይሎች ሊዛወሩ አይችሉም"</string>

    <string name="bluetooth_connect_action" msgid="2319449093046720209">"ከብሉቱዝ ጋር ተገናኝ"</string>

    <string name="bluetooth_enabled_apm_title" msgid="6914461147844949044">"ብሉቱዝ በአውሮፕላን ሁነታ ላይ በርቷል"</string>

    <string name="bluetooth_enabled_apm_message" msgid="8409900562494838113">"ብሉቱዝን አብርተው ካቆዩ በቀጣይ ጊዜ በአውሮፕላን ሁነታ ውስጥ ሲሆኑ ስልክዎ እሱን አብርቶ ማቆየቱን ያስታውሳል"</string>

    <string name="bluetooth_enabled_apm_message" msgid="6168686193308136881">"ብሉቱዝን አብርተው ካቆዩ በቀጣይ ጊዜ በአውሮፕላን ሁነታ ውስጥ ሲሆኑ መሣሪያዎ እሱን አብርቶ ማቆየቱን ያስታውሳል"</string>

    <string name="bluetooth_stays_on_title" msgid="39720820955212918">"ብሉቱዝ በርቶ ይቆያል"</string>

    <string name="bluetooth_stays_on_message" msgid="7142453371222249965">"ስልክዎ ብሉቱዝን በአውሮፕላን ሁነታ ውስጥ አብርቶ ማቆየትን ያስታውሳል። በርቶ እንዲቆይ ካልፈለጉ ብሉቱዝን ያጥፉት።"</string>

    <string name="bluetooth_stays_on_message" msgid="3669663452593157737">"መሣሪያዎ ብሉቱዝን በአውሮፕላን ሁነታ ውስጥ አብርቶ ማቆየትን ያስታውሳል። በርቶ እንዲቆይ ካልፈለጉ ብሉቱዝን ያጥፉት።"</string>

    <string name="bluetooth_and_wifi_stays_on_title" msgid="5821932798860821244">"Wi-Fi እና ብሉቱዝ በርተው ይቆያሉ"</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="2390749828997719812">"ስልክዎ Wi-Fiን እና ብሉቱዝን በአውሮፕላን ሁነታ ውስጥ አብርቶ ማቆየትን ያስታውሳል። በርተው እንዲቆዩ ካልፈለጉ Wi-Fi እና ብሉቱዝን ያጥፏቸው።"</string>

    <string name="bluetooth_and_wifi_stays_on_message" msgid="7848565203843882558">"መሣሪያዎ Wi-Fiን እና ብሉቱዝን በአውሮፕላን ሁነታ ውስጥ አብርቶ ማቆየትን ያስታውሳል። በርተው እንዲቆዩ ካልፈለጉ Wi-Fi እና ብሉቱዝን ያጥፏቸው።"</string>

</resources>