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

Commit 3b48dd81 authored by Andrew Chant's avatar Andrew Chant Committed by Android (Google) Code Review
Browse files

Merge "Updated SIG wording: whitelist to acceptlist. resolve merge conflicts... 

Merge "Updated SIG wording: whitelist to acceptlist. resolve merge conflicts of d496dcb2 to sc-d1-dev" into sc-d1-dev
parents 53d1ba67 2a8cf97d

android/app/AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
         android:description="@string/permdesc_bluetoothShareManager"

         android:protectionLevel="signature"/>



    <!--  Allows temporarily whitelisting Bluetooth addresses for sharing -->

    <permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE"

         android:label="@string/permlab_bluetoothWhitelist"

         android:description="@string/permdesc_bluetoothWhitelist"

    <!--  Allows temporarily acceptlisting Bluetooth addresses for sharing -->

    <permission android:name="com.android.permission.ALLOWLIST_BLUETOOTH_DEVICE"

         android:label="@string/permlab_bluetoothAcceptlist"

         android:description="@string/permdesc_bluetoothAcceptlist"

         android:protectionLevel="signature"/>



    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -120,10 +120,10 @@ 
        </receiver>

         <receiver android:process="@string/process"

              android:name=".opp.BluetoothOppHandoverReceiver"

              android:permission="com.android.permission.WHITELIST_BLUETOOTH_DEVICE"

              android:permission="com.android.permission.ALLOWLIST_BLUETOOTH_DEVICE"

              android:exported="true">

            <intent-filter>

                <action android:name="android.btopp.intent.action.WHITELIST_DEVICE"/>

                <action android:name="android.btopp.intent.action.ACCEPTLIST_DEVICE"/>

                <action android:name="android.btopp.intent.action.STOP_HANDOVER_TRANSFER"/>

            </intent-filter>

            <intent-filter>

android/app/jni/com_android_bluetooth_hearing_aid.cpp

+3 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static jboolean disconnectHearingAidNative(JNIEnv* env, jobject object, 
  return JNI_TRUE;

}



static jboolean addToWhiteListNative(JNIEnv* env, jobject object,

static jboolean addToAcceptlistNative(JNIEnv* env, jobject object,

                                     jbyteArray address) {

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sHearingAidInterface) return JNI_FALSE;
@@ -204,7 +204,7 @@ static jboolean addToWhiteListNative(JNIEnv* env, jobject object, 
  }



  RawAddress* tmpraw = (RawAddress*)addr;

  sHearingAidInterface->AddToWhiteList(*tmpraw);

  sHearingAidInterface->AddToAcceptlist(*tmpraw);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}
@@ -224,7 +224,7 @@ static JNINativeMethod sMethods[] = { 
    {"cleanupNative", "()V", (void*)cleanupNative},

    {"connectHearingAidNative", "([B)Z", (void*)connectHearingAidNative},

    {"disconnectHearingAidNative", "([B)Z", (void*)disconnectHearingAidNative},

    {"addToWhiteListNative", "([B)Z", (void*)addToWhiteListNative},

    {"addToAcceptlistNative", "([B)Z", (void*)addToAcceptlistNative},

    {"setVolumeNative", "(I)V", (void*)setVolumeNative},

};

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

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

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

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

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Witlys Bluetooth-toesteltoegang."</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Laat die program toe om \'n Bluetooth-toestel tydelik te witlys, sodat daardie toestel lêers na hierdie toestel kan stuur sonder die gebruiker se bevestiging."</string>

    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Witlys Bluetooth-toesteltoegang."</string>

    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Laat die program toe om \'n Bluetooth-toestel tydelik te witlys, sodat daardie toestel lêers na hierdie toestel kan stuur sonder die gebruiker se bevestiging."</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>

    <string name="unknown_device" msgid="9221903979877041009">"Onbekende toestel"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"Onbekend"</string>

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

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

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

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

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"የብሉቱዝ መሳሪያ መዳረሻን በተወዳጆች ዝርዝር ያስገቡ።"</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"መተግበሪያው አንድን የብሉቱዝ መሳሪያ በጊዜያዊነት በተወዳጆች ዝርዝር እንዲያስገባ ይፈቅድለታል፣ ይህም መሳሪያው ወደዚህኛው መሳሪያ ፋይሎችን ያለተጠቃሚው ማረጋገጫ ለመላክ ያስችለዋል።"</string>

    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"የብሉቱዝ መሳሪያ መዳረሻን በተወዳጆች ዝርዝር ያስገቡ።"</string>

    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"መተግበሪያው አንድን የብሉቱዝ መሳሪያ በጊዜያዊነት በተወዳጆች ዝርዝር እንዲያስገባ ይፈቅድለታል፣ ይህም መሳሪያው ወደዚህኛው መሳሪያ ፋይሎችን ያለተጠቃሚው ማረጋገጫ ለመላክ ያስችለዋል።"</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"ብሉቱዝ"</string>

    <string name="unknown_device" msgid="9221903979877041009">"ያልታወቀ መሣሪያ"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"ያልታወቀ"</string>

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

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

    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"الدخول إلى إدارة التنزيل."</string>

    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‏للسماح للتطبيق بالدخول إلى إدارة BluetoothShare واستخدامها لنقل الملفات."</string>

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"إضافة وصول جهاز بلوتوث إلى القائمة البيضاء."</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"يسمح للتطبيق مؤقتًا بإضافة جهاز بلوتوث إلى القائمة البيضاء مما يتيح لذلك الجهاز إرسال ملفات إلى هذا الجهاز بدون تأكيد المستخدم."</string>

    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"إضافة وصول جهاز بلوتوث إلى القائمة البيضاء."</string>

    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"يسمح للتطبيق مؤقتًا بإضافة جهاز بلوتوث إلى القائمة البيضاء مما يتيح لذلك الجهاز إرسال ملفات إلى هذا الجهاز بدون تأكيد المستخدم."</string>

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

    <string name="unknown_device" msgid="9221903979877041009">"جهاز غير معروف"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"غير معروف"</string>