PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7

Browse Source 
Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf
This commit is contained in:
Android Build Merger (Role)
2018-04-02 17:45:02 +00:00
parent eb76bf9861 dfe4cc74f7
commit d276b38666
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -30,6 +30,7 @@ import android.text.InputFilter;
import android.text.InputType;
import android.text.TextWatcher;
import android.text.InputFilter.LengthFilter;
import android.util.EventLog;
import android.util.Log;
import android.view.View;
import android.widget.Button;
@@ -197,8 +198,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);

7
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
View File

@@ -24,6 +24,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.preference.Preference;
import android.util.EventLog;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -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