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

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

Merge changes Iac44c9cf,Id113d56a into main am: 316da819 

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



Change-Id: If92701e15f66f81fda7bc32f32aefd92618c912e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 826a7c0d 316da819

service/build.gradle.kts

0 → 100644
+30 −0
Original line number Diff line number Diff line 
plugins {

    // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.

    id("org.jetbrains.kotlin.jvm") version "1.8.20"



    // Apply the java-library plugin for API and implementation separation.

    `java-library`

}



repositories {

    // Use Maven Central for resolving dependencies.

    mavenCentral()

}



sourceSets.main {

    java {

        exclude("**/*.bp")

        srcDirs("src", "aidl", "change-ids")

    }

}



dependencies {

    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")

    implementation(files("../../../../external/kotlinc/lib/kotlin-stdlib.jar"))

    implementation(files("../../../../out/soong/.intermediates/frameworks/libs/modules-utils/java/com/android/modules/utils/modules-utils-shell-command-handler/android_common_apex33/turbine-combined/modules-utils-shell-command-handler.jar"))

    implementation(files("../../../../out/soong/.intermediates/frameworks/libs/modules-utils/java/framework-annotations-lib/android_common/turbine-combined/framework-annotations-lib.jar"))

    implementation(files("../../../../out/soong/.intermediates/packages/modules/Bluetooth/framework/framework-bluetooth-pre-jarjar/android_common/turbine-combined/framework-bluetooth-pre-jarjar.jar"))

    implementation(files("../../../../out/soong/.intermediates/packages/modules/Bluetooth/service/change-ids/service-bluetooth.change-ids/android_common/turbine-combined/service-bluetooth.change-ids.jar"))

    implementation(files("../../../../prebuilts/sdk/33/system-server/android.jar"))

}

service/kls-classpath

0 → 100755
+25 −0
Original line number Diff line number Diff line 
#!/bin/bash





ROOT="$PWD/../../../../"

CLASSPATH=""

CLASSPATH+="$ROOT/external/kotlinc/lib/kotlin-stdlib.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/frameworks/base/api/android_system_server_stubs_current/android_common/turbine-combined/android_system_server_stubs_current.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/prebuilts/sdk/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/androidx.appcompat_appcompat/android_common_apex33/turbine-combined/androidx.appcompat_appcompat.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/Bluetooth/framework/framework-bluetooth-pre-jarjar/android_common/turbine-combined/framework-bluetooth-pre-jarjar.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/libcore/core-lambda-stubs/android_common/turbine-combined/core-lambda-stubs.jar"



CLASSPATH+=":$ROOT/out/soong/.intermediates/frameworks/libs/modules-utils/java/framework-annotations-lib/android_common/turbine-combined/framework-annotations-lib.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/ConfigInfrastructure/framework/framework-configinfrastructure.stubs.module_lib/android_common/turbine-combined/framework-configinfrastructure.stubs.module_lib.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/StatsD/framework/framework-statsd.stubs.module_lib/android_common/turbine-combined/framework-statsd.stubs.module_lib.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/Bluetooth/service/change-ids/service-bluetooth.change-ids/android_common/turbine-combined/service-bluetooth.change-ids.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/Bluetooth/framework/framework-bluetooth.impl/android_common/turbine-jarjar/framework-bluetooth.impl.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/prebuilts/sdk/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-alpha01/androidx.annotation_annotation/android_common_apex33/turbine-combined/androidx.annotation_annotation.jar"



CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/Bluetooth/service/bluetooth-manager-service-proto-java-gen/android_common_apex33/turbine-combined/bluetooth-manager-service-proto-java-gen.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/Bluetooth/service/bluetooth-nano-protos/android_common_apex33/turbine-combined/bluetooth-nano-protos.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/Bluetooth/android/app/bluetooth-proto-enums-java-gen/android_common_apex33/turbine-combined/bluetooth-proto-enums-java-gen.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/packages/modules/Bluetooth/flags/bluetooth_flags_java_lib/android_common_apex33/turbine-combined/bluetooth_flags_java_lib.jar"

CLASSPATH+=":$ROOT/out/soong/.intermediates/frameworks/libs/modules-utils/java/com/android/modules/utils/modules-utils-shell-command-handler/android_common_apex33/turbine-combined/modules-utils-shell-command-handler.jar"



echo "$CLASSPATH"

service/settings.gradle.kts

0 → 100644
+8 −0
Original line number Diff line number Diff line 
/*

 * This file was generated by the Gradle 'init' task.

 *

 * The settings file is used to specify which projects to include in your build.

 * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.5/userguide/building_swift_projects.html in the Gradle documentation.

 */



rootProject.name = "service"

service/src/RadioModeListener.kt

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ internal fun initializeRadioModeListener( 
/**

 * Check if Bluetooth is impacted by the radio and fetch global mode status

 *

 * @return weither Bluetooth should consider this radio or not

 * @return whether Bluetooth should consider this radio or not

 */

private fun getRadioModeValue(resolver: ContentResolver, radio: String, modeKey: String): Boolean {

    return if (isSensitive(resolver, radio)) {

service/src/RadioModeListenerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ class RadioModeListenerTest { 
    }



    @Test

    fun disable_whenDisabled_isDicarded() {

    fun disable_whenDisabled_isDiscarded() {

        enableSensitive()

        disableMode()