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

Commit 64e70327 authored by David Duarte's avatar David Duarte
Browse files

Merge udc_daily_340690210 into udc-dev 

Bug: 235762947
Bug: 242994452
Bug: 262605980
Bug: 264921486
Bug: 269973219
Bug: 271240397
Bug: 272585347
Bug: 273912385
Bug: 274722163
Bug: 274722185
Bug: 275668166
Bug: 276975913
Bug: 277008617
Bug: 277249213
Bug: 277337187
Bug: 277520864
Bug: 277523771
Bug: 277873778
Bug: 278635887
Bug: 279194432
Bug: 279270913
Bug: 279366294
Bug: 279524528
Bug: 279618149
Bug: 277592572
Bug: 277181818
Bug: 280390678

Ignore-AOSP-First: Merge changes from AOSP

Change-Id: Ic9aeafd3d4971bfd613f14e7a5395c3ef9f73bab
parents 5ea25f2d 7ddcac5b

TEST_MAPPING

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
    {

      "name": "net_test_bta"

    },

    {

      "name": "net_test_bta_security"

    },

    {

      "name": "net_test_btif"

    },
@@ -240,6 +243,9 @@ 
    {

      "name": "net_test_bta"

    },

    {

      "name": "net_test_bta_security"

    },

    {

      "name": "net_test_btif"

    },

android/app/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ cc_library_shared { 
        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libc++fs",

        "libchrome",

        "libevent",

        "libmodpb64",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
    <string name="download_line4" msgid="5234701398884321314"></string>

    <string name="download_line5" msgid="4124272066218470715">"Примање датотеки..."</string>

    <string name="download_cancel" msgid="1705762428762702342">"Запри"</string>

    <string name="download_ok" msgid="2404442707314575833">"Скриј"</string>

    <string name="download_ok" msgid="2404442707314575833">"Сокриј"</string>

    <string name="incoming_line1" msgid="6342300988329482408">"Од"</string>

    <string name="incoming_line2" msgid="2199520895444457585">"Име на датотека"</string>

    <string name="incoming_line3" msgid="8630078246326525633">"Големина"</string>

android/app/res/values-zh-rHK/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
    <string name="bluetooth_a2dp_sink_queue_name" msgid="7521243473328258997">"歌曲識別"</string>

    <string name="bluetooth_map_settings_save" msgid="8309113239113961550">"儲存"</string>

    <string name="bluetooth_map_settings_cancel" msgid="3374494364625947793">"取消"</string>

    <string name="bluetooth_map_settings_intro" msgid="4748160773998753325">"選取你要透過藍牙分享的帳戶。連線時，你仍然必須接受所有帳戶存取要求。"</string>

    <string name="bluetooth_map_settings_intro" msgid="4748160773998753325">"選取您要透過藍牙分享的帳戶。連線時，您仍然必須接受所有帳戶存取要求。"</string>

    <string name="bluetooth_map_settings_count" msgid="183013143617807702">"剩餘插槽數："</string>

    <string name="bluetooth_map_settings_app_icon" msgid="3501432663809664982">"應用程式圖示"</string>

    <string name="bluetooth_map_settings_title" msgid="4226030082708590023">"藍牙訊息分享設定"</string>
@@ -130,9 +130,9 @@ 
    <string name="bluetooth_opp_file_limit_exceeded" msgid="6612109860149473930">"無法轉移 4 GB 以上的檔案"</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="8409900562494838113">"如果您不關閉藍牙，下次手機進入飛行模式時，藍牙將保持開啟"</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="7142453371222249965">"手機會記得在飛行模式下保持藍牙開啟。如果您不希望保持開啟，請關閉藍牙。"</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="2390749828997719812">"手機會記得在飛行模式下保持 Wi-Fi 及藍牙開啟。如果您不希望保持開啟，請關閉 Wi-Fi 及藍牙。"</string>

</resources>

android/app/src/com/android/bluetooth/BluetoothMethodProxy.java

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.Handler;

import android.os.Message;

import android.os.ParcelFileDescriptor;

import android.provider.Telephony;

import android.util.Log;
@@ -194,6 +195,14 @@ public class BluetoothMethodProxy { 
        return handler.sendEmptyMessage(what);

    }



    /**

     * Proxies {@link Handler#sendMessageDelayed(Message, long)}.

     */

    public boolean handlerSendMessageDelayed(Handler handler, final int what,

            final long delayMillis) {

        return handler.sendMessageDelayed(handler.obtainMessage(what), delayMillis);

    }



    /**

     * Proxies {@link HeaderSet#getHeader}.

     */