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

Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into cw-f-dev

Browse Source 
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
This commit is contained in:
TreeHugger Robot
2018-04-09 20:29:54 +00:00
committed by Android (Google) Code Review
parent 41be25548e 7b2b84c617
commit 70643c1bf4
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.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;
@@ -203,8 +204,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.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