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

Commit 3b45db5b authored by Thomas Girardier's avatar Thomas Girardier Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-2362244-OFMNDGXNRY" 

* changes:
  Revert "Extend Metadata Database with GMCS, GTBS CCC data"
  Revert "mcs: Re-register for notifications from cache"
  Revert "tbs: Re-register for notifications from cache"
parents 72a69778 d949b116

android/app/src/com/android/bluetooth/btservice/storage/CustomizedMetadataEntity.java

+1 −7
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ class CustomizedMetadataEntity { 
    public byte[] spatial_audio;

    public byte[] fastpair_customized;

    public byte[] le_audio;

    public byte[] gmcs_cccd;

    public byte[] gtbs_cccd;



    public String toString() {

        StringBuilder builder = new StringBuilder();
@@ -105,11 +103,7 @@ class CustomizedMetadataEntity { 
                .append("|fastpair_customized=")

                .append(metadataToString(fastpair_customized))

                .append("|le_audio=")

                .append(metadataToString(le_audio))

                .append("|gmcs_cccd=")

                .append(metadataToString(gmcs_cccd))

                .append("|gtbs_cccd=")

                .append(metadataToString(gtbs_cccd));

                .append(metadataToString(le_audio));





        return builder.toString();

android/app/src/com/android/bluetooth/btservice/storage/Metadata.java

+0 −12
Original line number Diff line number Diff line
@@ -297,12 +297,6 @@ class Metadata { 
            case BluetoothDevice.METADATA_LE_AUDIO:

                publicMetadata.le_audio = value;

                break;

            case BluetoothDevice.METADATA_GMCS_CCCD:

                publicMetadata.gmcs_cccd = value;

                break;

            case BluetoothDevice.METADATA_GTBS_CCCD:

                publicMetadata.gtbs_cccd = value;

                break;

        }

    }
@@ -390,12 +384,6 @@ class Metadata { 
            case BluetoothDevice.METADATA_LE_AUDIO:

                value = publicMetadata.le_audio;

                break;

            case BluetoothDevice.METADATA_GMCS_CCCD:

                value = publicMetadata.gmcs_cccd;

                break;

            case BluetoothDevice.METADATA_GTBS_CCCD:

                value = publicMetadata.gtbs_cccd;

                break;

        }

        return value;

    }

android/app/src/com/android/bluetooth/btservice/storage/MetadataDatabase.java

+1 −19
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.util.List; 
/**

 * MetadataDatabase is a Room database stores Bluetooth persistence data

 */

@Database(entities = {Metadata.class}, version = 117)

@Database(entities = {Metadata.class}, version = 116)

public abstract class MetadataDatabase extends RoomDatabase {

    /**

     * The metadata database file name
@@ -69,7 +69,6 @@ public abstract class MetadataDatabase extends RoomDatabase { 
                .addMigrations(MIGRATION_113_114)

                .addMigrations(MIGRATION_114_115)

                .addMigrations(MIGRATION_115_116)

                .addMigrations(MIGRATION_116_117)

                .allowMainThreadQueries()

                .build();

    }
@@ -549,21 +548,4 @@ public abstract class MetadataDatabase extends RoomDatabase { 
            }

        }

    };



    @VisibleForTesting

    static final Migration MIGRATION_116_117 = new Migration(116, 117) {

        @Override

        public void migrate(SupportSQLiteDatabase database) {

            try {

                database.execSQL("ALTER TABLE metadata ADD COLUMN `gmcs_cccd` BLOB");

                database.execSQL("ALTER TABLE metadata ADD COLUMN `gtbs_cccd` BLOB");

            } catch (SQLException ex) {

                // Check if user has new schema, but is just missing the version update

                Cursor cursor = database.query("SELECT * FROM metadata");

                if (cursor == null || cursor.getColumnIndex("gmcs_cccd") == -1) {

                    throw ex;

                }

            }

        }

    };

}

android/app/src/com/android/bluetooth/mcp/MediaControlGattService.java

+4 −110
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


package com.android.bluetooth.mcp;



import static android.bluetooth.BluetoothDevice.METADATA_GMCS_CCCD;

import static android.bluetooth.BluetoothGattCharacteristic.PERMISSION_READ_ENCRYPTED;

import static android.bluetooth.BluetoothGattCharacteristic.PERMISSION_WRITE_ENCRYPTED;

import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_NOTIFY;
@@ -29,7 +28,6 @@ import static java.util.Map.entry; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothGatt;

import android.bluetooth.BluetoothGattCharacteristic;
@@ -39,17 +37,12 @@ import android.bluetooth.BluetoothGattServerCallback; 
import android.bluetooth.BluetoothGattService;

import android.bluetooth.BluetoothManager;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.IBluetoothManager;

import android.bluetooth.IBluetoothStateChangeCallback;

import android.content.Context;

import android.os.Handler;

import android.os.Looper;

import android.os.ParcelUuid;

import android.os.RemoteException;

import android.util.Log;

import android.util.Pair;



import com.android.bluetooth.Utils;

import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.hearingaid.HearingAidService;
@@ -448,7 +441,7 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
                } else {

                    status = BluetoothGatt.GATT_SUCCESS;

                    setCcc(device, op.mDescriptor.getCharacteristic().getUuid(), op.mOffset,

                            op.mValue, true);

                            op.mValue);

                }



                if (op.mResponseNeeded) {
@@ -529,34 +522,6 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
        }

    }



    private void restoreCccValuesForStoredDevices() {

        for (BluetoothDevice device : mAdapterService.getBondedDevices()) {

            byte[] gmcs_cccd = device.getMetadata(METADATA_GMCS_CCCD);



            if ((gmcs_cccd == null) || (gmcs_cccd.length == 0)) {

                return;

            }



            List<ParcelUuid> uuidList = Arrays.asList(Utils.byteArrayToUuid(gmcs_cccd));



            /* Restore CCCD values for device */

            for (ParcelUuid uuid : uuidList) {

                setCcc(device, uuid.getUuid(), 0,

                        BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE, false);

            }

        }

    }



    private final IBluetoothStateChangeCallback mBluetoothStateChangeCallback =

            new IBluetoothStateChangeCallback.Stub() {

                public void onBluetoothStateChange(boolean up) {

                    if (DBG) Log.d(TAG, "onBluetoothStateChange: up=" + up);

                    if (up) {

                        restoreCccValuesForStoredDevices();

                    }

                }

            };



    @VisibleForTesting

    final BluetoothGattServerCallback mServerCallback = new BluetoothGattServerCallback() {

        @Override
@@ -586,7 +551,6 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 


            mCharacteristics.get(CharId.CONTENT_CONTROL_ID)

                    .setValue(mCcid, BluetoothGattCharacteristic.FORMAT_UINT8, 0);

            restoreCccValuesForStoredDevices();

            setInitialCharacteristicValuesAndNotify();

            initialStateRequest();

        }
@@ -832,15 +796,6 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
        mMcpService = mcpService;

        mAdapterService =  Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService shouldn't be null when creating MediaControlCattService");



        IBluetoothManager mgr = BluetoothAdapter.getDefaultAdapter().getBluetoothManager();

        if (mgr != null) {

            try {

                mgr.registerStateChangeCallback(mBluetoothStateChangeCallback);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }

    }



    protected boolean init(UUID scvUuid) {
@@ -1032,77 +987,16 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
        return mBluetoothGattServer.addService(mGattService);

    }



    private void removeUuidFromMetadata(ParcelUuid charUuid, BluetoothDevice device) {

        List<ParcelUuid> uuidList;

        byte[] gmcs_cccd = device.getMetadata(METADATA_GMCS_CCCD);



        if ((gmcs_cccd == null) || (gmcs_cccd.length == 0)) {

            uuidList = new ArrayList<ParcelUuid>();

        } else {

            uuidList = new ArrayList<>(Arrays.asList(Utils.byteArrayToUuid(gmcs_cccd)));



            if (!uuidList.contains(charUuid)) {

                Log.d(TAG, "Characteristic CCCD can't be removed (not cached): "

                        + charUuid.toString());

                return;

            }

        }



        uuidList.remove(charUuid);



        if (!device.setMetadata(METADATA_GMCS_CCCD,

                Utils.uuidsToByteArray(uuidList.toArray(new ParcelUuid[0])))) {

            Log.e(TAG, "Can't set CCCD for GMCS characteristic UUID: " + charUuid.toString()

                    + ", (remove)");

        }

    }



    private void addUuidToMetadata(ParcelUuid charUuid, BluetoothDevice device) {

        List<ParcelUuid> uuidList;

        byte[] gmcs_cccd = device.getMetadata(METADATA_GMCS_CCCD);



        if ((gmcs_cccd == null) || (gmcs_cccd.length == 0)) {

            uuidList = new ArrayList<ParcelUuid>();

        } else {

            uuidList = new ArrayList<>(Arrays.asList(Utils.byteArrayToUuid(gmcs_cccd)));



            if (uuidList.contains(charUuid)) {

                Log.d(TAG, "Characteristic CCCD already added: " + charUuid.toString());

                return;

            }

        }



        uuidList.add(charUuid);



        if (!device.setMetadata(METADATA_GMCS_CCCD,

                Utils.uuidsToByteArray(uuidList.toArray(new ParcelUuid[0])))) {

            Log.e(TAG, "Can't set CCCD for GMCS characteristic UUID: " + charUuid.toString()

                    + ", (add)");

        }

    }



    @VisibleForTesting

    void setCcc(BluetoothDevice device, UUID charUuid, int offset, byte[] value, boolean store) {

    void setCcc(BluetoothDevice device, UUID charUuid, int offset, byte[] value) {

        HashMap<UUID, Short> characteristicCcc = mCccDescriptorValues.get(device.getAddress());

        if (characteristicCcc == null) {

            characteristicCcc = new HashMap<>();

            mCccDescriptorValues.put(device.getAddress(), characteristicCcc);

        }



        characteristicCcc.put(charUuid,

                ByteBuffer.wrap(value).order(ByteOrder.LITTLE_ENDIAN).getShort());



        if (!store) {

            return;

        }



        if (Arrays.equals(value, BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE)) {

            addUuidToMetadata(new ParcelUuid(charUuid), device);

        } else if (Arrays.equals(value, BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE)) {

            removeUuidFromMetadata(new ParcelUuid(charUuid), device);

        } else {

            Log.e(TAG, "Not handled CCC value: " + Arrays.toString(value));

        }

        characteristicCcc.put(

                charUuid, ByteBuffer.wrap(value).order(ByteOrder.LITTLE_ENDIAN).getShort());

    }



    private byte[] getCccBytes(BluetoothDevice device, UUID charUuid) {

android/app/src/com/android/bluetooth/tbs/BluetoothGattServerProxy.java

+0 −16
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.bluetooth.BluetoothProfile; 
import android.content.Context;



import java.util.List;

import java.util.UUID;



/**

 * A proxy class that facilitates testing of the TbsService class.
@@ -64,21 +63,6 @@ public class BluetoothGattServerProxy { 
        return mBluetoothGattServer.addService(service);

    }



    /**

     * A proxy that Returns a {@link BluetoothGattService} from the list of services offered

     * by this device.

     *

     * <p>If multiple instances of the same service (as identified by UUID)

     * exist, the first instance of the service is returned.

     *

     * @param uuid UUID of the requested service

     * @return BluetoothGattService if supported, or null if the requested service is not offered by

     * this device.

     */

    public BluetoothGattService getService(UUID uuid) {

        return mBluetoothGattServer.getService(uuid);

    }



    public boolean sendResponse(BluetoothDevice device, int requestId, int status, int offset,

            byte[] value) {

        return mBluetoothGattServer.sendResponse(device, requestId, status, offset, value);