diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index bb66da6420b860ed20e9ccd074bac2ec46632ab0..d5a95f003323a85616288dd908d0b73905face31 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -30,6 +30,7 @@ import android.text.InputFilter; import android.text.InputFilter.LengthFilter; import android.text.InputType; import android.text.TextWatcher; +import android.util.EventLog; import android.util.Log; import android.view.KeyEvent; import android.view.View; @@ -293,8 +294,9 @@ public final class BluetoothPairingDialog extends AlertActivity implements } else { if (mDevice.getBluetoothClass().getDeviceClass() == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) { - contactSharing.setChecked(true); - mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); + contactSharing.setChecked(false); + mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED); + EventLog.writeEvent(0x534e4554, "73173182", -1, ""); } else { contactSharing.setChecked(false); mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED); diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index efcc7f92f65c7beb79f5d7712889c607d3205baf..e49f981dd7a1523cff47e5b3878ba73c0a37456e 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.support.v7.preference.Preference; +import android.util.EventLog; import android.util.Log; import android.view.View; import android.widget.Button; @@ -154,7 +155,11 @@ public class BluetoothPermissionActivity extends AlertActivity implements String mRemoteName = mDevice != null ? mDevice.getAliasName() : null; if (mRemoteName == null) mRemoteName = getString(R.string.unknown); - return mRemoteName; + String nameNoNewline = mRemoteName.replaceAll("[\\t\\n\\r]+", " "); + if (!mRemoteName.equals(nameNoNewline)) { + EventLog.writeEvent(0x534e4554, "72872376", -1, ""); + } + return nameNoNewline; } // TODO(edjee): createConnectionDialogView, createPhonebookDialogView and createMapDialogView