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

Commit adc26ec1 authored by Jeremy Klein's avatar Jeremy Klein Committed by Andre Eisenbach
Browse files

Remove unused mContext from BluetoothGatt[Server]. 

All that this member variable is doing right now is leaking a
reference to a context without any benefit.

Bug: 31752040
Bug: 31710795
Change-Id: If2241422533318b866340e8dcc9f5fbd9518349c
parent 4e236046

core/java/android/bluetooth/BluetoothDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ public final class BluetoothDevice implements Parcelable { 
                // BLE is not supported

                return null;

            }

            BluetoothGatt gatt = new BluetoothGatt(context, iGatt, this, transport);

            BluetoothGatt gatt = new BluetoothGatt(iGatt, this, transport);

            gatt.connect(autoConnect, callback);

            return gatt;

        } catch (RemoteException e) {Log.e(TAG, "", e);}

core/java/android/bluetooth/BluetoothGatt.java

+1 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ public final class BluetoothGatt implements BluetoothProfile { 
    private static final boolean DBG = true;

    private static final boolean VDBG = false;



    private final Context mContext;

    private IBluetoothGatt mService;

    private BluetoothGattCallback mCallback;

    private int mClientIf;
@@ -496,9 +495,8 @@ public final class BluetoothGatt implements BluetoothProfile { 
            }

        };



    /*package*/ BluetoothGatt(Context context, IBluetoothGatt iGatt, BluetoothDevice device,

    /*package*/ BluetoothGatt(IBluetoothGatt iGatt, BluetoothDevice device,

                                int transport) {

        mContext = context;

        mService = iGatt;

        mDevice = device;

        mTransport = transport;

core/java/android/bluetooth/BluetoothGattServer.java

+1 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    private static final boolean DBG = true;

    private static final boolean VDBG = false;



    private final Context mContext;

    private BluetoothAdapter mAdapter;

    private IBluetoothGatt mService;

    private BluetoothGattServerCallback mCallback;
@@ -307,8 +306,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    /**

     * Create a BluetoothGattServer proxy object.

     */

    /*package*/ BluetoothGattServer(Context context, IBluetoothGatt iGatt, int transport) {

        mContext = context;

    /*package*/ BluetoothGattServer(IBluetoothGatt iGatt, int transport) {

        mService = iGatt;

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        mCallback = null;

core/java/android/bluetooth/BluetoothManager.java

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ public final class BluetoothManager { 
                Log.e(TAG, "Fail to get GATT Server connection");

                return null;

            }

            BluetoothGattServer mGattServer = new BluetoothGattServer(context, iGatt,transport);

            BluetoothGattServer mGattServer = new BluetoothGattServer(iGatt,transport);

            Boolean regStatus = mGattServer.registerCallback(callback);

            return regStatus? mGattServer : null;

        } catch (RemoteException e) {