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

Commit 1cc68cfd authored by Henri Chataing's avatar Henri Chataing
Browse files

Remove the init_flags module 

All existing init flags have been migrated to feature
flags or removed and the rust module can now be deleted.

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, dead code removal
Change-Id: I38be97fad7f9bd42f432d74e5b8090a08dc4502a
parent b03c7ca9

Cargo.toml

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
[workspace]



default-members = [

  "system/gd/rust/shim",

  "system/gd/rust/topshim",

  "system/gd/rust/linux/mgmt",

  "system/gd/rust/linux/service",
@@ -26,7 +25,6 @@ default-members = [ 
]



members = [

  "system/gd/rust/shim",

  "system/gd/rust/topshim",

  "system/gd/rust/linux/mgmt",

  "system/gd/rust/linux/service",

android/app/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ cc_library_shared { 
        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtcore",

        "libbtdevice",

        "libbte",

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+6 −27
Original line number Diff line number Diff line
@@ -1020,8 +1020,7 @@ int hal_util_load_bt_library(const bt_interface_t** interface) { 
}



static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, jboolean isCommonCriteriaMode,

                       int configCompareResult, jobjectArray initFlags, jboolean isAtvDevice,

                       jstring userDataDirectory) {

                       int configCompareResult, jboolean isAtvDevice, jstring userDataDirectory) {

  std::unique_lock<std::shared_timed_mutex> lock(jniObjMutex);



  log::verbose("");
@@ -1036,34 +1035,15 @@ static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, jboolean isCo 
    return JNI_FALSE;

  }



  int flagCount = env->GetArrayLength(initFlags);

  jstring* flagObjs = new jstring[flagCount];

  const char** flags = nullptr;

  if (flagCount > 0) {

    flags = new const char*[flagCount + 1];

    flags[flagCount] = nullptr;

  }



  for (int i = 0; i < flagCount; i++) {

    flagObjs[i] = (jstring)env->GetObjectArrayElement(initFlags, i);

    flags[i] = env->GetStringUTFChars(flagObjs[i], NULL);

  }



  const char* user_data_directory = env->GetStringUTFChars(userDataDirectory, NULL);



  int ret = sBluetoothInterface->init(&sBluetoothCallbacks, isGuest == JNI_TRUE ? 1 : 0,

  int ret =

          sBluetoothInterface->init(&sBluetoothCallbacks, isGuest == JNI_TRUE ? 1 : 0,

                                    isCommonCriteriaMode == JNI_TRUE ? 1 : 0, configCompareResult,

                                      flags, isAtvDevice == JNI_TRUE ? 1 : 0, user_data_directory);

                                    nullptr, isAtvDevice == JNI_TRUE ? 1 : 0, user_data_directory);



  env->ReleaseStringUTFChars(userDataDirectory, user_data_directory);



  for (int i = 0; i < flagCount; i++) {

    env->ReleaseStringUTFChars(flagObjs[i], flags[i]);

  }



  delete[] flags;

  delete[] flagObjs;



  if (ret != BT_STATUS_SUCCESS) {

    log::error("Error while setting the callbacks: {}", ret);

    sBluetoothInterface = NULL;
@@ -2245,8 +2225,7 @@ static jboolean restoreFilterAcceptListNative(JNIEnv* /* env */, jobject /* obj 


int register_com_android_bluetooth_btservice_AdapterService(JNIEnv* env) {

  const JNINativeMethod methods[] = {

          {"initNative", "(ZZI[Ljava/lang/String;ZLjava/lang/String;)Z",

           reinterpret_cast<void*>(initNative)},

          {"initNative", "(ZZIZLjava/lang/String;)Z", reinterpret_cast<void*>(initNative)},

          {"cleanupNative", "()V", reinterpret_cast<void*>(cleanupNative)},

          {"enableNative", "()Z", reinterpret_cast<void*>(enableNative)},

          {"disableNative", "()Z", reinterpret_cast<void*>(disableNative)},

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

+0 −3
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ public class AdapterNativeInterface { 
            boolean startRestricted,

            boolean isCommonCriteriaMode,

            int configCompareResult,

            String[] initFlags,

            boolean isAtvDevice,

            String userDataDirectory) {

        mJniCallbacks = new JniCallbacks(service, adapterProperties);
@@ -72,7 +71,6 @@ public class AdapterNativeInterface { 
                startRestricted,

                isCommonCriteriaMode,

                configCompareResult,

                initFlags,

                isAtvDevice,

                userDataDirectory);

    }
@@ -297,7 +295,6 @@ public class AdapterNativeInterface { 
            boolean startRestricted,

            boolean isCommonCriteriaMode,

            int configCompareResult,

            String[] initFlags,

            boolean isAtvDevice,

            String userDataDirectory);

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

+0 −13
Original line number Diff line number Diff line
@@ -700,7 +700,6 @@ public class AdapterService extends Service { 
                mUserManager.isGuestUser(),

                isCommonCriteriaMode,

                configCompareResult,

                getInitFlags(),

                isAtvDevice,

                getApplicationInfo().dataDir);

        mNativeAvailable = true;
@@ -6441,18 +6440,6 @@ public class AdapterService extends Service { 
        }

    }



    private String[] getInitFlags() {

        final DeviceConfig.Properties properties =

                DeviceConfig.getProperties(DeviceConfig.NAMESPACE_BLUETOOTH);

        ArrayList<String> initFlags = new ArrayList<>();

        for (String property : properties.getKeyset()) {

            if (property.startsWith("INIT_")) {

                initFlags.add(property + "=" + properties.getString(property, null));

            }

        }

        return initFlags.toArray(new String[0]);

    }



    private final Object mDeviceConfigLock = new Object();



    /**