commit 642541ce6cceb831821e01b0044987c139513701
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 19 01:34:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 19 01:34:46 2018 +0000
tree 02ecdf3867dc48ae7b9064325e1a24e12e168869
parent 568abb4016dfb23d5b92b734769ee4c4b7bcebad
parent a5748bdcbb28f24d2e3754d741c16fca6bbd191d

Merge "Revert "Prevent sending broadcasts for non-changing properties.""

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

diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java
index 9ad8043..60f7947 100644
--- a/src/com/android/bluetooth/btservice/RemoteDevices.java
+++ b/src/com/android/bluetooth/btservice/RemoteDevices.java
@@ -39,10 +39,8 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Queue;
-import java.util.Set;
 
 final class RemoteDevices {
     private static final boolean DBG = false;
@@ -457,32 +455,6 @@
         sAdapterService.sendBroadcast(intent, AdapterService.BLUETOOTH_PERM);
     }
 
-    private static boolean areUuidsEqual(ParcelUuid[] uuids1, ParcelUuid[] uuids2) {
-        final int length1 = uuids1 == null ? 0 : uuids1.length;
-        final int length2 = uuids2 == null ? 0 : uuids2.length;
-        if (length1 != length2) {
-            return false;
-        }
-        Set<ParcelUuid> set = new HashSet<>();
-        for (int i = 0; i < length1; ++i) {
-            set.add(uuids1[i]);
-        }
-        for (int i = 0; i < length2; ++i) {
-            set.remove(uuids2[i]);
-        }
-        return set.isEmpty();
-    }
-
-    private static boolean areStringsEqual(String string1, String string2) {
-        if (string1 == null && string2 == null) {
-            return true;
-        }
-        if (string1 == null || string2 == null) {
-            return false;
-        }
-        return string1.equals(string2);
-    }
-
     void devicePropertyChangedCallback(byte[] address, int[] types, byte[][] values) {
         Intent intent;
         byte[] val;
@@ -510,12 +482,7 @@
                     debugLog("Property type: " + type);
                     switch (type) {
                         case AbstractionLayer.BT_PROPERTY_BDNAME:
-                            final String newName = new String(val);
-                            if (areStringsEqual(newName, device.mName)) {
-                                if (DBG) Log.d(TAG, "Skip name update for " + bdDevice);
-                                break;
-                            }
-                            device.mName = newName;
+                            device.mName = new String(val);
                             intent = new Intent(BluetoothDevice.ACTION_NAME_CHANGED);
                             intent.putExtra(BluetoothDevice.EXTRA_DEVICE, bdDevice);
                             intent.putExtra(BluetoothDevice.EXTRA_NAME, device.mName);
@@ -535,11 +502,6 @@
                             debugLog("Remote Address is:" + Utils.getAddressStringFromByte(val));
                             break;
                         case AbstractionLayer.BT_PROPERTY_CLASS_OF_DEVICE:
-                            final int newClass = Utils.byteArrayToInt(val);
-                            if (newClass == device.mBluetoothClass) {
-                                if (DBG) Log.d(TAG, "Skip class update for " + bdDevice);
-                                break;
-                            }
                             device.mBluetoothClass = Utils.byteArrayToInt(val);
                             intent = new Intent(BluetoothDevice.ACTION_CLASS_CHANGED);
                             intent.putExtra(BluetoothDevice.EXTRA_DEVICE, bdDevice);
@@ -551,16 +513,7 @@
                             break;
                         case AbstractionLayer.BT_PROPERTY_UUIDS:
                             int numUuids = val.length / AbstractionLayer.BT_UUID_SIZE;
-                            final ParcelUuid[] newUuids = device.mUuids =
-                                    Utils.byteArrayToUuid(val);
-                            if (areUuidsEqual(newUuids, device.mUuids)) {
-                                if (DBG) {
-                                    Log.d(TAG, "Skip uuids update for "
-                                            + bdDevice.getAddress());
-                                }
-                                break;
-                            }
-                            device.mUuids = newUuids;
+                            device.mUuids = Utils.byteArrayToUuid(val);
                             if (sAdapterService.getState() == BluetoothAdapter.STATE_ON) {
                                 sendUuidIntent(bdDevice);
                             }