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

Commit d980b3e5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12173239 from 311b3bdc to 24Q4-release 

Change-Id: Ie1466bbf790b7d1afa93b30e146d7880616a0c4c
parents 764daea5 311b3bdc

TEST_MAPPING

+0 −3
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ 
    {

      "name": "bluetooth_test_common"

    },

    {

      "name": "bluetooth_test_gd_unit"

    },

    {

      "name": "bluetooth_test_sdp"

    },

android/app/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -324,23 +324,31 @@ android_app { 
        enabled: true,

        javacflags: [

            "-Xep:AlmostJavadoc:ERROR",

            "-Xep:AndroidFrameworkBinderIdentity:ERROR",

            "-Xep:AndroidFrameworkEfficientStrings:ERROR",

            "-Xep:AndroidFrameworkRequiresPermission:ERROR",

            "-Xep:BadImport:ERROR",

            "-Xep:ClassCanBeStatic:ERROR",

            "-Xep:DateFormatConstant:ERROR",

            "-Xep:EmptyBlockTag:ERROR",

            "-Xep:HidingField:ERROR",

            "-Xep:InlineMeInliner:ERROR",

            "-Xep:InvalidBlockTag:ERROR",

            "-Xep:InvalidParam:ERROR",

            "-Xep:MissingCasesInEnumSwitch:ERROR",

            "-Xep:MockNotUsedInProduction:ERROR",

            "-Xep:ModifyCollectionInEnhancedForLoop:ERROR",

            "-Xep:NonApiType:ERROR",

            "-Xep:NonCanonicalType:ERROR",

            "-Xep:NotJavadoc:ERROR",

            "-Xep:ReturnAtTheEndOfVoidFunction:ERROR",

            "-Xep:StringCaseLocaleUsage:ERROR",

            "-Xep:StringCharset:ERROR",

            "-Xep:UnnecessaryStringBuilder:ERROR",

            "-Xep:UnusedMethod:ERROR",

            "-Xep:UnusedNestedClass:ERROR",

            "-Xep:UnusedVariable:ERROR",

            "-Xep:WaitNotInLoop:ERROR",

            "-XepExcludedPaths:.*/srcjars/.*", // Exclude generated files

        ],

    },

android/app/jni/com_android_bluetooth_vc.cpp

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
                                 addr.get());

  }



  void OnVolumeStateChanged(const RawAddress& bd_addr, uint8_t volume, bool mute,

  void OnVolumeStateChanged(const RawAddress& bd_addr, uint8_t volume, bool mute, uint8_t flags,

                            bool isAutonomous) override {

    log::info("");
@@ -86,7 +86,7 @@ public: 


    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress), (jbyte*)&bd_addr);

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onVolumeStateChanged, (jint)volume,

                                 (jboolean)mute, addr.get(), (jboolean)isAutonomous);

                                 (jboolean)mute, (jint)flags, addr.get(), (jboolean)isAutonomous);

  }



  void OnGroupVolumeStateChanged(int group_id, uint8_t volume, bool mute,
@@ -533,7 +533,7 @@ int register_com_android_bluetooth_vc(JNIEnv* env) { 


  const JNIJavaMethod javaMethods[] = {

          {"onConnectionStateChanged", "(I[B)V", &method_onConnectionStateChanged},

          {"onVolumeStateChanged", "(IZ[BZ)V", &method_onVolumeStateChanged},

          {"onVolumeStateChanged", "(IZI[BZ)V", &method_onVolumeStateChanged},

          {"onGroupVolumeStateChanged", "(IZIZ)V", &method_onGroupVolumeStateChanged},

          {"onDeviceAvailable", "(I[B)V", &method_onDeviceAvailable},

          {"onExtAudioOutVolumeOffsetChanged", "(II[B)V", &method_onExtAudioOutVolumeOffsetChanged},

android/app/src/com/android/bluetooth/BluetoothEventLogger.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class BluetoothEventLogger { 
        }



        public String toString() {

            return (new StringBuilder(mTimeStamp).append(" ").append(mMsg).toString());

            return mTimeStamp + " " + mMsg;

        }

    }

android/app/src/com/android/bluetooth/bass_client/BassClientStateMachine.java

+19 −16
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class BassClientStateMachine extends StateMachine { 
            AdapterService adapterService,

            Looper looper,

            int connectTimeoutMs) {

        super(TAG + "(" + device.toString() + ")", looper);

        super(TAG + "(" + device + ")", looper);

        mDevice = device;

        mService = svc;

        mAdapterService = adapterService;
@@ -182,7 +182,8 @@ public class BassClientStateMachine extends StateMachine { 
        addState(mConnectedProcessing);

        setInitialState(mDisconnected);

        mFirstTimeBisDiscoveryMap = new HashMap<Integer, Boolean>();

        long token = Binder.clearCallingIdentity();

        final long token = Binder.clearCallingIdentity();

        try {

            mIsAllowedList =

                    DeviceConfig.getBoolean(

                            DeviceConfig.NAMESPACE_BLUETOOTH, "persist.vendor.service.bt.wl", true);
@@ -196,8 +197,10 @@ public class BassClientStateMachine extends StateMachine { 
                            DeviceConfig.NAMESPACE_BLUETOOTH,

                            "persist.vendor.service.bt.forceSB",

                            false);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    static BassClientStateMachine make(

            BluetoothDevice device,