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

Commit 68aee76c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-5b9b9a64-937a-49c8-8624-8f3097e6fbf0-for-git_oc-dr1-release-41... 

release-request-5b9b9a64-937a-49c8-8624-8f3097e6fbf0-for-git_oc-dr1-release-4173081 snap-temp-L87600000081515330

Change-Id: If19f8b9b768cc3bce44736230a6c05bdec46263e
parents 80338af1 c0069d24

jni/com_android_bluetooth_gatt.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1008,12 +1008,13 @@ static void gattClientScanNative(JNIEnv* env, jobject object, jboolean start) { 


static void gattClientConnectNative(JNIEnv* env, jobject object, jint clientif,

                                    jstring address, jboolean isDirect,

                                    jint transport, jint initiating_phys) {

                                    jint transport, jboolean opportunistic,

                                    jint initiating_phys) {

  if (!sGattIf) return;



  bt_bdaddr_t bda;

  jstr2bdaddr(env, &bda, address);

  sGattIf->client->connect(clientif, &bda, isDirect, transport,

  sGattIf->client->connect(clientif, &bda, isDirect, transport, opportunistic,

                           initiating_phys);

}
@@ -2172,7 +2173,7 @@ static JNINativeMethod sMethods[] = { 
     (void*)gattClientRegisterAppNative},

    {"gattClientUnregisterAppNative", "(I)V",

     (void*)gattClientUnregisterAppNative},

    {"gattClientConnectNative", "(ILjava/lang/String;ZII)V",

    {"gattClientConnectNative", "(ILjava/lang/String;ZIZI)V",

     (void*)gattClientConnectNative},

    {"gattClientDisconnectNative", "(ILjava/lang/String;I)V",

     (void*)gattClientDisconnectNative},

src/com/android/bluetooth/avrcp/Avrcp.java

+8 −0
Original line number Diff line number Diff line
@@ -57,9 +57,11 @@ import com.android.bluetooth.Utils; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.SortedMap;

import java.util.TreeMap;
@@ -1582,9 +1584,15 @@ public final class Avrcp { 
                @Override

                public void onActiveSessionsChanged(

                        List<android.media.session.MediaController> newControllers) {

                    Set<String> updatedPackages = new HashSet<String>();

                    // Update the current players

                    for (android.media.session.MediaController controller : newControllers) {

                        String packageName = controller.getPackageName();

                        if (DEBUG) Log.v(TAG, "ActiveSession: " + MediaController.wrap(controller));

                        // Only use the first (highest priority) controller from each package

                        if (updatedPackages.contains(packageName)) continue;

                        addMediaPlayerController(controller);

                        updatedPackages.add(packageName);

                    }



                    if (newControllers.size() > 0 && getAddressedPlayerInfo() == null) {

src/com/android/bluetooth/gatt/GattService.java

+10 −9
Original line number Diff line number Diff line
@@ -417,11 +417,11 @@ public class GattService extends ProfileService { 
        }



        @Override

        public void clientConnect(

                int clientIf, String address, boolean isDirect, int transport, int phy) {

        public void clientConnect(int clientIf, String address, boolean isDirect, int transport,

                boolean opportunistic, int phy) {

            GattService service = getService();

            if (service == null) return;

            service.clientConnect(clientIf, address, isDirect, transport, phy);

            service.clientConnect(clientIf, address, isDirect, transport, opportunistic, phy);

        }



        @Override
@@ -1792,14 +1792,15 @@ public class GattService extends ProfileService { 
        gattClientUnregisterAppNative(clientIf);

    }



    void clientConnect(int clientIf, String address, boolean isDirect, int transport, int phy) {

    void clientConnect(int clientIf, String address, boolean isDirect, int transport,

            boolean opportunistic, int phy) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");



        if (DBG) {

            Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect + ", phy= "

                            + phy);

            Log.d(TAG, "clientConnect() - address=" + address + ", isDirect=" + isDirect

                            + ", opportunistic=" + opportunistic + ", phy=" + phy);

        }

        gattClientConnectNative(clientIf, address, isDirect, transport, phy);

        gattClientConnectNative(clientIf, address, isDirect, transport, opportunistic, phy);

    }



    void clientDisconnect(int clientIf, String address) {
@@ -2686,8 +2687,8 @@ public class GattService extends ProfileService { 


    private native void gattClientUnregisterAppNative(int clientIf);



    private native void gattClientConnectNative(

            int clientIf, String address, boolean isDirect, int transport, int initiating_phys);

    private native void gattClientConnectNative(int clientIf, String address, boolean isDirect,

            int transport, boolean opportunistic, int initiating_phys);



    private native void gattClientDisconnectNative(int clientIf, String address,

            int conn_id);