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

Commit edc5eb8c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log redaction: remove dead code" into main am: de499902 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3183684



Change-Id: Ieab4acee1fbeb868694aae1bc2b9d60cdd4e9b51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49f8b8be de499902

android/app/aidl/android/bluetooth/IBluetooth.aidl

+0 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ interface IBluetooth 


    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.LOCAL_MAC_ADDRESS})")

    String getAddress(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    boolean isLogRedactionEnabled();

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    List<ParcelUuid> getUuids(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+0 −7
Original line number Diff line number Diff line
@@ -1898,11 +1898,6 @@ static void metadataChangedNative(JNIEnv* env, jobject /* obj */, jbyteArray add 
  return;

}



static jboolean isLogRedactionEnabledNative(JNIEnv* /* env */, jobject /* obj */) {

  log::verbose("");

  return bluetooth::os::should_log_be_redacted();

}



static jboolean interopMatchAddrNative(JNIEnv* env, jclass /* clazz */, jstring feature_name,

                                       jstring address) {

  log::verbose("");
@@ -2180,8 +2175,6 @@ int register_com_android_bluetooth_btservice_AdapterService(JNIEnv* env) { 
          {"allowLowLatencyAudioNative", "(Z[B)Z",

           reinterpret_cast<void*>(allowLowLatencyAudioNative)},

          {"metadataChangedNative", "([BI[B)V", reinterpret_cast<void*>(metadataChangedNative)},

          {"isLogRedactionEnabledNative", "()Z",

           reinterpret_cast<void*>(isLogRedactionEnabledNative)},

          {"interopMatchAddrNative", "(Ljava/lang/String;Ljava/lang/String;)Z",

           reinterpret_cast<void*>(interopMatchAddrNative)},

          {"interopMatchNameNative", "(Ljava/lang/String;Ljava/lang/String;)Z",

android/app/src/com/android/bluetooth/btservice/AdapterNativeInterface.java

+0 −6
Original line number Diff line number Diff line
@@ -247,10 +247,6 @@ public class AdapterNativeInterface { 
        return pbapPseDynamicVersionUpgradeIsEnabledNative();

    }



    boolean isLogRedactionEnabled() {

        return isLogRedactionEnabledNative();

    }



    int getSocketL2capLocalChannelId(ParcelUuid connectionUuid) {

        return getSocketL2capLocalChannelIdNative(

                connectionUuid.getUuid().getLeastSignificantBits(),
@@ -370,8 +366,6 @@ public class AdapterNativeInterface { 


    private native boolean pbapPseDynamicVersionUpgradeIsEnabledNative();



    private native boolean isLogRedactionEnabledNative();



    private native int getSocketL2capLocalChannelIdNative(

            long connectionUuidLsb, long connectionUuidMsb);

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −11
Original line number Diff line number Diff line
@@ -2375,15 +2375,6 @@ public class AdapterService extends Service { 
            return Utils.getAddressStringFromByte(service.mAdapterProperties.getAddress());

        }



        @Override

        public boolean isLogRedactionEnabled() {

            AdapterService service = getService();

            if (service == null) {

                return true;

            }

            return service.mNativeInterface.isLogRedactionEnabled();

        }



        @Override

        public List<ParcelUuid> getUuids(AttributionSource source) {

            AdapterService service = getService();
@@ -2712,7 +2703,7 @@ public class AdapterService extends Service { 
            if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {

                Log.w(

                        TAG,

                        device.getAddressForLogging()

                        device

                                + " cannot be removed since "

                                + ((deviceProp == null)

                                        ? "properties are empty"
@@ -4311,7 +4302,7 @@ public class AdapterService extends Service { 
     * @return whether the preferences were successfully requested

     */

    private int setPreferredAudioProfiles(BluetoothDevice device, Bundle modeToProfileBundle) {

        Log.i(TAG, "setPreferredAudioProfiles for device=" + device.getAddressForLogging());

        Log.i(TAG, "setPreferredAudioProfiles for device=" + device);

        if (!isDualModeAudioEnabled()) {

            Log.e(TAG, "setPreferredAudioProfiles called while sysprop is disabled");

            return BluetoothStatusCodes.FEATURE_NOT_SUPPORTED;

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ final class BondStateMachine extends StateMachine { 


        Log.w(

                TAG,

                dev.getAddressForLogging()

                dev

                        + " cannot be removed since "

                        + ((devProp == null)

                                ? "properties are empty"