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

Commit 958fca0e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-94bbded7-c270-40fa-9a74-fedecfd046c6-for-git_oc-release-403417... 

release-request-94bbded7-c270-40fa-9a74-fedecfd046c6-for-git_oc-release-4034177 snap-temp-L73200000066785187

Change-Id: I4ccd40a7ff9dc0e0ae4abeba34d7692e29078bae
parents baf84054 85d0a389

src/com/android/bluetooth/btservice/AdapterService.java

+4 −12
Original line number Diff line number Diff line
@@ -259,8 +259,6 @@ public class AdapterService extends Service { 
                doUpdate=true;

            }

        }

        debugLog("processProfileServiceStateChanged() serviceName=" + serviceName

            + ", state=" + state +", doUpdate=" + doUpdate);



        if (!doUpdate) {

            return;
@@ -299,11 +297,8 @@ public class AdapterService extends Service { 
                Iterator<Map.Entry<String,Integer>> i = mProfileServicesState.entrySet().iterator();

                while (i.hasNext()) {

                    Map.Entry<String,Integer> entry = i.next();

                    debugLog("Service: " + entry.getKey());

                    if (entry.getKey().equals("com.android.bluetooth.gatt.GattService")) {

                        debugLog("Skip GATT service - already started before");

                        continue;

                    }

                    if (entry.getKey().equals("com.android.bluetooth.gatt.GattService")) continue;



                    if (BluetoothAdapter.STATE_OFF != entry.getValue()) {

                        debugLog("onProfileServiceStateChange() - Profile still running: "

                            + entry.getKey());
@@ -325,11 +320,8 @@ public class AdapterService extends Service { 
                Iterator<Map.Entry<String,Integer>> i = mProfileServicesState.entrySet().iterator();

                while (i.hasNext()) {

                    Map.Entry<String,Integer> entry = i.next();

                    debugLog("Service: " + entry.getKey());

                    if (entry.getKey().equals("com.android.bluetooth.gatt.GattService")) {

                        debugLog("Skip GATT service - already started before");

                        continue;

                    }

                    if (entry.getKey().equals("com.android.bluetooth.gatt.GattService")) continue;



                    if (BluetoothAdapter.STATE_ON != entry.getValue()) {

                        debugLog("onProfileServiceStateChange() - Profile still not running:"

                            + entry.getKey());

src/com/android/bluetooth/btservice/RemoteDevices.java

+1 −4
Original line number Diff line number Diff line
@@ -309,10 +309,7 @@ final class RemoteDevices { 
        for (int j = 0; j < types.length; j++) {

            type = types[j];

            val = values[j];

            if (val.length <= 0)

                errorLog("devicePropertyChangedCallback: bdDevice: " + bdDevice

                        + ", value is empty for type: " + type);

            else {

            if (val.length > 0) {

                synchronized(mObject) {

                    debugLog("Property type: " + type);

                    switch (type) {