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

Commit 8ad77de8 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Rename NewAvrcp to Avrcp" am: 774a2437 

am: d80336cd

Change-Id: I41167b10571d0b40ff5bb94e31e33a4a01fb6785
parents 20a8008d d80336cd

android/app/jni/com_android_bluetooth_avrcp_target.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "NewAvrcpTargetJni"

#define LOG_TAG "AvrcpTargetJni"



#include <base/bind.h>

#include <map>

android/app/src/com/android/bluetooth/newavrcp/AvrcpNativeInterface.java→android/app/src/com/android/bluetooth/avrcp/AvrcpNativeInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import java.util.List; 
 * data.

 */

public class AvrcpNativeInterface {

    private static final String TAG = "NewAvrcpNativeInterface";

    private static final String TAG = "AvrcpNativeInterface";

    private static final boolean DEBUG = true;



    private static AvrcpNativeInterface sInstance;

android/app/src/com/android/bluetooth/newavrcp/AvrcpTargetService.java→android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import java.util.Objects; 
 * @hide

 */

public class AvrcpTargetService extends ProfileService {

    private static final String TAG = "NewAvrcpTargetService";

    private static final String TAG = "AvrcpTargetService";

    private static final boolean DEBUG = true;

    private static final String AVRCP_ENABLE_PROPERTY = "persist.bluetooth.enablenewavrcp";

android/app/src/com/android/bluetooth/newavrcp/AvrcpVolumeManager.java→android/app/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.Map; 
import java.util.Objects;



class AvrcpVolumeManager extends AudioDeviceCallback {

    public static final String TAG = "NewAvrcpVolumeManager";

    public static final String TAG = "AvrcpVolumeManager";

    public static final boolean DEBUG = true;



    // All volumes are stored at system volume values, not AVRCP values

android/app/src/com/android/bluetooth/newavrcp/BrowsablePlayerConnector.java→android/app/src/com/android/bluetooth/avrcp/BrowsablePlayerConnector.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.Set; 
 * when constructing BrowsedPlayerWrappers by hand.

 */

public class BrowsablePlayerConnector {

    private static final String TAG = "NewAvrcpBrowsablePlayerConnector";

    private static final String TAG = "AvrcpBrowsablePlayerConnector";

    private static final boolean DEBUG = true;

    private static final long CONNECT_TIMEOUT_MS = 10000; // Time in ms to wait for a connection