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

Skip to content
Commit e060bf41 authored by Manish Kumar's avatar Manish Kumar
Browse files

Merge commit 'android-4.4.1_r1' into merge_branch

* commit 'android-4.4.1_r1':
  remove a read lock to work around a platform deadlock problem.
  LE: Fix stack crash on invalid descriptor write request
  cancel device discovery before start pairing process
  Handles AT+BVRA=1 received during an open SCO session.
  Import translations. DO NOT MERGE
  FF/REW is not correctly for AVRCP.
  NPE in bluetooth MAP cause bluetooth process crash
  Import translations. DO NOT MERGE
  MAP: fix problem with MNS not disconnecting correctly
  Change pairing api/intent permission from PRIVILEGED to ADMIN
  Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345

Conflicts:
	src/com/android/bluetooth/a2dp/Avrcp.java
	src/com/android/bluetooth/btservice/RemoteDevices.java
	src/com/android/bluetooth/map/BluetoothMnsObexClient.java

Change-Id: I094236d37a8077742124f393fc06c696b43c7129
parents 78b6fbbc 025c8ec1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment