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

Commit a43f3bf8 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Automerger Merge Worker
Browse files

Merge "[TeX] Removed JNI dependency" into main am: a433c5aa 

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



Change-Id: Ic39f0863c8733eec7d689c944a142a0125954191
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 140c3235 a433c5aa

android/app/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ cc_library_shared { 
        "libchrome",

        "libcutils",

        "libevent",

        "libexpresslog_jni",

        "libflatbuffers-cpp",

        "libfmq",

        "libg722codec",
@@ -135,7 +134,6 @@ cc_library_shared { 
        "libosi",

        "libprotobuf-cpp-lite",

        "libstatslog_bt",

        "libtextclassifier_hash_static",

        "libudrv-uipc",

        "libutils",

        "server_configurable_flags",

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+0 −10
Original line number Diff line number Diff line
@@ -2218,9 +2218,6 @@ int register_com_android_bluetooth_btservice_AdapterService(JNIEnv* env) { 
  return 0;

}



extern int register_com_android_modules_expresslog_Utils(

    JNIEnv* env, const char* const kUtilsClassName);



} /* namespace android */



/*
@@ -2355,13 +2352,6 @@ jint JNI_OnLoad(JavaVM* jvm, void* /* reserved */) { 
    return JNI_ERR;

  }



  status = android::register_com_android_modules_expresslog_Utils(

      e, "com/android/bluetooth/x/com/android/modules/expresslog/Utils");

  if (status < 0) {

    ALOGE("jni expresslog utils failure: %d", status);

    return JNI_ERR;

  }



  return JNI_VERSION_1_6;

}

framework/java/android/bluetooth/BluetoothAdapter.java

+3 −6
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ import android.util.Log; 
import android.util.Pair;



import com.android.internal.annotations.GuardedBy;

import com.android.modules.expresslog.StatsExpressLog;

import com.android.modules.expresslog.Counter;

import com.android.modules.utils.SynchronousResultReceiver;



import java.io.IOException;
@@ -3747,11 +3747,8 @@ public final class BluetoothAdapter { 
                            + proxy.getAdapter()

                            + " but expected "

                            + this);

            // farmhash::Fingerprint64("bluetooth.value_close_profile_proxy_adapter_mismatch")

            // TODO(b/310684444): Remove this magic value

            long metricIdHash = 5174922474613897731L;

            StatsExpressLog.write(

                    StatsExpressLog.EXPRESS_UID_EVENT_REPORTED, metricIdHash, 1, Process.myUid());

            Counter.logIncrementWithUid(

                    "bluetooth.value_close_profile_proxy_adapter_mismatch", Process.myUid());

            proxy.getAdapter().closeProfileProxy(proxy);

            return;

        }