commit 18b3d041032786e6ae392d3f613377c1b9387952
author Chris Manton <cmanton@google.com> Wed Sep 22 17:35:21 2021 -0700
committer Chris Manton <cmanton@google.com> Thu Sep 23 04:58:05 2021 +0000
tree e1bfa0e526e6798e21b44d9da1e3bea32b4b1f8b
parent b4d7d319112a18d7768282ed1bbc9388773e327b

DatabaseManager : Remove mac address leakage

Bug: 183961974
Test: atest BluetoothInstrumentationTests
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I46d2531a2c859276dad0428bfad7940082c1302d

src/com/android/bluetooth/btservice/storage/DatabaseManager.java

diff --git a/src/com/android/bluetooth/btservice/storage/DatabaseManager.java b/src/com/android/bluetooth/btservice/storage/DatabaseManager.java
index f644371..c05d511 100644
--- a/src/com/android/bluetooth/btservice/storage/DatabaseManager.java
+++ b/src/com/android/bluetooth/btservice/storage/DatabaseManager.java
@@ -23,7 +23,6 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothProtoEnums;
-import android.content.AttributionSource;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -367,14 +366,14 @@
             String address = device.getAddress();
 
             if (!mMetadataCache.containsKey(address)) {
-                Log.d(TAG, "getProfileConnectionPolicy: device " + address + " is not in cache");
+                Log.d(TAG, "getProfileConnectionPolicy: device xx:xx:xx:xx:xx:xx is not in cache");
                 return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
             }
 
             Metadata data = mMetadataCache.get(address);
             int connectionPolicy = data.getProfileConnectionPolicy(profile);
 
-            Log.v(TAG, "getProfileConnectionPolicy: " + address + ", profile=" + profile
+            Log.v(TAG, "getProfileConnectionPolicy: xx:xx:xx:xx:xx:xx, profile=" + profile
                     + ", connectionPolicy = " + connectionPolicy);
             return connectionPolicy;
         }
@@ -529,7 +528,7 @@
      */
     public void setConnection(BluetoothDevice device, boolean isA2dpDevice) {
         synchronized (mMetadataCache) {
-            Log.d(TAG, "setConnection: device=" + device + " and isA2dpDevice=" + isA2dpDevice);
+            Log.d(TAG, "setConnection: device=xx:xx:xx:xx:xx:xx and isA2dpDevice=" + isA2dpDevice);
             if (device == null) {
                 Log.e(TAG, "setConnection: device is null");
                 return;
@@ -555,7 +554,7 @@
                 metadata.is_active_a2dp_device = true;
             }
 
-            Log.d(TAG, "Updating last connected time for device: " + device + " to "
+            Log.d(TAG, "Updating last connected time for device: xx:xx:xx:xx:xx:xx to "
                     + metadata.last_active_time);
             updateDatabase(metadata);
         }
@@ -666,7 +665,7 @@
             Metadata metadata = metadataList.get(index);
             if (metadata.last_active_time != MetadataDatabase.sCurrentConnectionNumber) {
                 Log.d(TAG, "compactLastConnectionTime: Setting last_active_item for device: "
-                        + metadata.getAddress() + " from " + metadata.last_active_time + " to "
+                        + "xx:xx:xx:xx:xx:xx from " + metadata.last_active_time + " to "
                         + MetadataDatabase.sCurrentConnectionNumber);
                 metadata.last_active_time = MetadataDatabase.sCurrentConnectionNumber;
                 updateDatabase(metadata);
@@ -789,7 +788,7 @@
             mMigratedFromSettingsGlobal = true;
             for (Metadata data : list) {
                 String address = data.getAddress();
-                Log.v(TAG, "cacheMetadata: found device " + address);
+                Log.v(TAG, "cacheMetadata: found device xx:xx:xx:xx:xx:xx");
                 mMetadataCache.put(address, data);
             }
             Log.i(TAG, "cacheMetadata: Database is ready");
@@ -996,7 +995,7 @@
             Log.e(TAG, "updateDatabase: address is null");
             return;
         }
-        Log.d(TAG, "updateDatabase " + data.getAddress());
+        Log.d(TAG, "updateDatabase xx:xx:xx:xx:xx:xx");
         Message message = mHandler.obtainMessage(MSG_UPDATE_DATABASE);
         message.obj = data;
         mHandler.sendMessage(message);