From: Andre Eisenbach <eisenbach@google.com>
Date: Fri, 5 Feb 2016 20:03:30 +0000 (+0000)
Subject: Merge "Enhance AVRCP Absolute Volume control implementation" am: b8a26db0b7
X-Git-Tag: android-7.1.2_r17~195
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7a51f31646fa78a10bb89ff691a9e1fb8b8a1e34;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "Enhance AVRCP Absolute Volume control implementation" am: b8a26db0b7
am: 6b82837c0f

* commit '6b82837c0facc5f3c343a00f407abd6ee2312496':
  Enhance AVRCP Absolute Volume control implementation
---

7a51f31646fa78a10bb89ff691a9e1fb8b8a1e34
diff --cc src/com/android/bluetooth/avrcp/Avrcp.java
index 58c4459b,7d140373..450574a9
--- a/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@@ -23,8 -24,11 +23,10 @@@ import android.bluetooth.BluetoothA2dp
  import android.bluetooth.BluetoothAvrcp;
  import android.content.Context;
  import android.content.Intent;
+ import android.content.res.Resources;
+ import android.content.SharedPreferences;
  import android.graphics.Bitmap;
  import android.media.AudioManager;
 -import android.media.IRemoteControlDisplay;
  import android.media.MediaMetadataRetriever;
  import android.media.RemoteControlClient;
  import android.media.RemoteController;