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

Commit 6b6d3376 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19a
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
parents bab8dca6 e25ebddf

src/com/android/settings/bluetooth/BluetoothPairingDialog.java

+4 −2
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/bluetooth/BluetoothPermissionActivity.java

+6 −1
Original line number Diff line number Diff line
@@ -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