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

Commit 12301d7b authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android Pie into master"

parents 24cb9704 170901af

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
    <uses-permission android:name="android.permission.READ_CONTACTS" />

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

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

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

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

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

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

jni/com_android_bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#ifndef COM_ANDROID_BLUETOOTH_H

#define COM_ANDROID_BLUETOOTH_H



#include "JNIHelp.h"

#include <nativehelper/JNIHelp.h>

#include "android_runtime/AndroidRuntime.h"

#include "android_runtime/Log.h"

#include "hardware/bluetooth.h"

jni/com_android_bluetooth_gatt.cpp

+7 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,13 @@ static void gattServerSendResponseNative(JNIEnv* env, jobject object, 
  response.attr_value.len = 0;



  if (val != NULL) {

    if (env->GetArrayLength(val) < BTGATT_MAX_ATTR_LEN) {

      response.attr_value.len = (uint16_t)env->GetArrayLength(val);

    } else {

      android_errorWriteLog(0x534e4554, "78787521");

      response.attr_value.len = BTGATT_MAX_ATTR_LEN;

    }



    jbyte* array = env->GetByteArrayElements(val, 0);



    for (int i = 0; i != response.attr_value.len; ++i)

res/values-af/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -132,4 +132,5 @@ 
    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-oudio is gekoppel"</string>

    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-oudio is ontkoppel"</string>

    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-oudio"</string>

    <string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Lêers groter as 4 GB kan nie oorgedra word nie"</string>

</resources>

res/values-am/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -132,4 +132,5 @@ 
    <string name="bluetooth_connected" msgid="6718623220072656906">"የብሉቱዝ ኦዲዮ ተገናኝቷል"</string>

    <string name="bluetooth_disconnected" msgid="3318303728981478873">"የብሉቱዝ ኦዲዮ ግንኙነት ተቋርጧል"</string>

    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"የብሉቱዝ ኦዲዮ"</string>

    <string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"ከ4 ጊባ በላይ የሆኑ ፋይሎች ሊዛወሩ አይችሉም"</string>

</resources>