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

Commit b6546b90 authored by Tom Huang's avatar Tom Huang Committed by Automerger Merge Worker
Browse files

Merge "Security fix: PBAP contacts and call history sharing" into tm-qpr-dev... 

Merge "Security fix: PBAP contacts and call history sharing" into tm-qpr-dev am: 1524bd79 am: cdd44a7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19320255



Change-Id: I35395057b3ead80ed5db726a7df2ebf4bc3fb19d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb833e3a cdd44a7b

packages/SettingsLib/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -246,9 +246,9 @@ 
    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->

    <string name="bluetooth_profile_pan">Internet access</string>

    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->

    <string name="bluetooth_profile_pbap">Contact sharing</string>

    <string name="bluetooth_profile_pbap">Contacts and call history sharing</string>

    <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->

    <string name="bluetooth_profile_pbap_summary">Use for contact sharing</string>

    <string name="bluetooth_profile_pbap_summary">Use for contacts and call history sharing</string>

    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->

    <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>

    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->