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

Commit 39ad0d19 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master

parents 2569320f 0230068a

android/app/Android.bp

+6 −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",
@@ -121,6 +122,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-fa/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"‏دسترسی به Download Manager."</string>

    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‏به برنامه برای دسترسی به مدیر BluetoothShare و استفاده از آن برای انتقال فایل‌ها اجازه می‌دهد."</string>

    <string name="permlab_bluetoothAcceptlist" msgid="2647575807648622053">"مجاز کردن دسترسی به دستگاه بلوتوثی."</string>

    <string name="permlab_bluetoothAcceptlist" msgid="2647575807648622053">"قرار دادن دسترسی دستگاه بلوتوث در فهرست مجاز."</string>

    <string name="permdesc_bluetoothAcceptlist" msgid="2406423665674766442">"به برنامه اجازه می‌دهد موقتاً یک دستگاه بلوتوث را در فهرست مجاز قرار دهد؛ با این کار دستگاه موردنظر مجاز خواهد بود بدون تأیید کاربر برای این دستگاه فایل ارسال کند."</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"بلوتوث"</string>

    <string name="unknown_device" msgid="9221903979877041009">"دستگاه ناشناس"</string>

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

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
    <string name="status_running" msgid="6562808920311008696">"ફાઇલ સ્થાનાંતરણ ચાલુ છે."</string>

    <string name="status_success" msgid="239573225847565868">"ફાઇલ સ્થાનાંતરણ સફળતાપૂર્વક પૂર્ણ થયું."</string>

    <string name="status_not_accept" msgid="1695082417193780738">"સામગ્રી સમર્થિત નથી."</string>

    <string name="status_forbidden" msgid="613956401054050725">"સ્થાનાંતરણ લક્ષિત ડિવાઇસ દ્વારા પ્રતિબંધિત."</string>

    <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>
@@ -127,7 +127,7 @@ 
    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"તમે બ્લૂટૂથ મારફતે શેર કરવા માગતા હો તે એકાઉન્ટ્સ પસંદ કરો. તમારે હજી પણ કનેક્ટ કરતી વખતે એકાઉન્ટ્સ પરની કોઈપણ અ‍ૅક્સેસ સ્વીકારવી પડશે."</string>

    <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"સ્લોટ્સ બાકી:"</string>

    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ઍપ્લિકેશન આયકન"</string>

    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"બ્લૂટૂથ સંદેશ શેરિંગ સેટિંગ"</string>

    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"બ્લૂટૂથ સંદેશ શેરિંગ સેટિંગ્સ"</string>

    <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"એકાઉન્ટ પસંદ કરી શકાતું નથી. 0 સ્લોટ્સ બાકી"</string>

    <string name="bluetooth_connected" msgid="6718623220072656906">"બ્લૂટૂથ ઑડિઓ કનેક્ટ થયું"</string>

    <string name="bluetooth_disconnected" msgid="3318303728981478873">"બ્લૂટૂથ ઑડિઓ ડિસ્કનેક્ટ થયું"</string>

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>