From db38eb73db2ffef87bcab51aa8ceb7d6fa6a3ca0 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 24 May 2021 10:00:23 -0600
Subject: CloseGuard for more Bluetooth components.

We've seen evidence of IBluetoothProfileServiceConnection and
IBluetoothStateChangeCallback references being leaked, so attempt to
unregister them when an object is finalized without closing.

Bug: 189091551
Test: manual
Change-Id: I23792d48d94578acd7fc7a5164a95171801ee721
---
 .../java/android/bluetooth/BluetoothProfileConnector.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'framework/java/android/bluetooth/BluetoothProfileConnector.java')

diff --git a/framework/java/android/bluetooth/BluetoothProfileConnector.java b/framework/java/android/bluetooth/BluetoothProfileConnector.java
index beff841f2f..a254291f57 100644
--- a/framework/java/android/bluetooth/BluetoothProfileConnector.java
+++ b/framework/java/android/bluetooth/BluetoothProfileConnector.java
@@ -26,6 +26,7 @@ import android.os.Build;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.util.CloseGuard;
 import android.util.Log;
 
 /**
@@ -36,6 +37,7 @@ import android.util.Log;
  */
 @SuppressLint("AndroidFrameworkBluetoothPermission")
 public abstract class BluetoothProfileConnector<T> {
+    private final CloseGuard mCloseGuard = new CloseGuard();
     private final int mProfileId;
     private BluetoothProfile.ServiceListener mServiceListener;
     private final BluetoothProfile mProfileProxy;
@@ -82,11 +84,19 @@ public abstract class BluetoothProfileConnector<T> {
         mServiceName = serviceName;
     }
 
+    /** {@hide} */
+    @Override
+    public void finalize() {
+        mCloseGuard.warnIfOpen();
+        doUnbind();
+    }
+
     @SuppressLint("AndroidFrameworkRequiresPermission")
     private boolean doBind() {
         synchronized (mConnection) {
             if (mService == null) {
                 logDebug("Binding service...");
+                mCloseGuard.open("doUnbind");
                 try {
                     Intent intent = new Intent(mServiceName);
                     ComponentName comp = intent.resolveSystemService(
@@ -110,6 +120,7 @@ public abstract class BluetoothProfileConnector<T> {
         synchronized (mConnection) {
             if (mService != null) {
                 logDebug("Unbinding service...");
+                mCloseGuard.close();
                 try {
                     mContext.unbindService(mConnection);
                 } catch (IllegalArgumentException ie) {
-- 
cgit v1.2.3