commit 9fbf23d020bf41d265f2601cba5832d21cc8f7b1
author android-build-team Robot <android-build-team-robot@google.com> Fri Dec 15 00:48:22 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Dec 15 00:48:22 2017 +0000
tree dc647db124d86a5f18ceeb4239f9b1e7d15d59b8
parent bc43bdb2d8d0ae0b798260c564bfd905ead64048
parent 879d04837e925a3a3b2ccd1c78f1d3efbfc43576

Merge cherrypicks of [3368067, 3367704, 3367466, 3367467, 3368164, 3368165, 3368166, 3368148, 3368149, 3368279, 3368280, 3368281, 3368127, 3368068, 3368339, 3368340, 3368150, 3368151, 3368341] into oc-m3-release

Change-Id: I3c020b9ff6765f361867232c4c774428838d33b6

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 76e314b..4bc1f621 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1471,7 +1471,7 @@
     <string name="bluetooth_display_passkey_pin_msg">To pair with:<xliff:g id="bold1">&lt;br>&lt;b></xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">&lt;/b>&lt;br>&lt;br></xliff:g>Type on it:<xliff:g id="bold2">&lt;br>&lt;b></xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">&lt;/b></xliff:g>, then press Return or Enter.</string>
 
     <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_pairing_shares_phonebook">Allow <xliff:g id="device_name">%1$s</xliff:g> to access your contacts and call history</string>
+    <string name="bluetooth_pairing_shares_phonebook">Allow access to your contacts and call history</string>
 
     <!-- Title for BT error dialogs. -->
     <string name="bluetooth_error_title"></string>

tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java

diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index fba11de..80b4810 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -290,7 +290,6 @@
         CheckBox sharingCheckbox = (CheckBox) frag.getmDialog()
                 .findViewById(R.id.phonebook_sharing_message_confirm_pin);
         assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(sharingCheckbox.getText().toString().contains(FAKE_DEVICE_NAME)).isTrue();
     }
 
     @Test