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

Commit dd280104 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: Ib7b0d096d3f47ca7b9522b7da75373420edd02d9
Change-Id: I3331ab8f496deb8dc499de093a2089602e30dd5b
parents b9d70e16 568c59d8

android/app/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ cc_library_shared { 


android_app {

    name: "Bluetooth",

    defaults: ["platform_app_defaults"],



    srcs: [

        "src/**/*.java",
@@ -106,6 +107,7 @@ android_app { 
        "android.hardware.radio-V1.0-java",

        "mmslib",

        "modules-utils-backgroundthread",

        "modules-utils-bytesmatcher",

    ],



    plugins: [
@@ -123,6 +125,11 @@ android_app { 
        "//apex_available:platform",

        "com.android.bluetooth.updatable",

    ],

    errorprone: {

        javacflags: [

            // "-Xep:AndroidFrameworkRequiresPermission:ERROR",

        ],

    },

}



genrule {

android/app/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
    <uses-permission android:name="android.permission.INTERNET"/>

    <uses-permission android:name="android.permission.BLUETOOTH"/>

    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>

    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>

    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>

    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>

    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED"/>

    <uses-permission android:name="android.permission.BLUETOOTH_MAP"/>

    <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
@@ -72,6 +75,8 @@ 
    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>

    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>

    <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES"/>

    <uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>

    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS"/>



    <uses-sdk android:minSdkVersion="14"/>

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
    <string name="status_forbidden" msgid="613956401054050725">"लक्ष्य डिवाइस द्वारा स्थानांतरण प्रतिबंधित किया गया."</string>

    <string name="status_canceled" msgid="6664490318773098285">"उपयोगकर्ता ने ट्रांसफर रद्द किया."</string>

    <string name="status_file_error" msgid="3671917770630165299">"मेमोरी समस्या."</string>

    <string name="status_no_sd_card_nosdcard" msgid="573631036356922221">"कोई USB स्टोरेज नहीं."</string>

    <string name="status_no_sd_card_nosdcard" msgid="573631036356922221">"कोई USB मेमोरी नहीं."</string>

    <string name="status_no_sd_card_default" msgid="396564893716701954">"कोई SD कार्ड नहीं. ट्रांसफ़र की गई फ़ाइलें सेव करने के लिए SD कार्ड लगाएं."</string>

    <string name="status_connection_error" msgid="947681831523219891">"कनेक्‍शन विफल."</string>

    <string name="status_protocol_error" msgid="3245444473429269539">"अनुरोध को सही तरह से प्रबंधित नहीं किया जा सकता."</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
    <string name="status_connection_error" msgid="947681831523219891">"החיבור נכשל."</string>

    <string name="status_protocol_error" msgid="3245444473429269539">"לא ניתן לטפל בבקשה כהלכה."</string>

    <string name="status_unknown_error" msgid="8156660554237824912">"שגיאה לא ידועה."</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"‏קבצים שהתקבלו דרך Bluetooth"</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"‏התקבל באמצעות Bluetooth"</string>

    <string name="opp_notification_group" msgid="3486303082135789982">"‏שיתוף Bluetooth"</string>

    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> שהתקבלו הושלמו."</string>

    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> שנשלחו הושלמו."</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -133,5 +133,5 @@ 
    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth дыбысы ажыратылды"</string>

    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth aудиосы"</string>

    <string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Көлемі 4 ГБ-тан асатын файлдар тасымалданбайды"</string>

    <string name="bluetooth_connect_action" msgid="4009848433321657090">"Bluetooth-қа қосылу"</string>

    <string name="bluetooth_connect_action" msgid="4009848433321657090">"Bluetooth-ге қосылу"</string>

</resources>