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

Commit 643c9e03 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes Ia1d03ae7,I6ecf0396 into main am: 26940a38 am: bb6c9ac9 

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



Change-Id: I34279e791377912e4375385a4251d9e04179aaab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 038578d8 bb6c9ac9

android/app/Android.bp

+1 −21
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ cc_library { 
}



// Bluetooth APK



android_app {

    name: "Bluetooth",

    defaults: ["bluetooth_framework_errorprone_rules"],
@@ -211,6 +210,7 @@ android_app { 
        ":system-messages-proto-src",

        "proto/keystore.proto",

        "src/**/*.java",

        "src/**/*.kt",

    ],

    proto: {

        type: "lite",
@@ -226,7 +226,6 @@ android_app { 


    jni_uses_platform_apis: true,

    libs: [

        "app-compat-annotations",

        "bluetooth_constants_java",

        "bluetooth_flags_java_lib",

        "error_prone_annotations",
@@ -238,7 +237,6 @@ android_app { 
        "framework-mediaprovider.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "unsupportedappusage",



        // Need to link the class at runtime

        "framework-bluetooth.stubs.module_lib",
@@ -338,24 +336,6 @@ android_app { 
    updatable: true,

}



java_library {

    name: "bluetooth.change-ids",

    srcs: [

        "src/com/android/bluetooth/ChangeIds.java",

    ],

    libs: [

        "app-compat-annotations",

    ],

    apex_available: ["com.android.bt"],

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

}



platform_compat_config {

    name: "bluetoothapk-platform-compat-config",

    src: ":bluetooth.change-ids",

}



java_library {

    name: "bluetooth-proto-enums-java-gen",

    installable: false,

android/app/change-ids/Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
// Copyright 2025 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



java_library {

    name: "bluetooth.change-ids",

    srcs: ["com/android/bluetooth/ChangeIds.java"],

    libs: ["app-compat-annotations"],

    apex_available: ["com.android.bt"],

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

}



platform_compat_config {

    name: "bluetoothapk-platform-compat-config",

    src: ":bluetooth.change-ids",

}

android/app/src/com/android/bluetooth/gatt/GattServiceConfig.java→android/app/src/com/android/bluetooth/gatt/GattServiceConfig.kt

+4 −5
Original line number Diff line number Diff line
@@ -14,10 +14,9 @@ 
 * limitations under the License.

 */



package com.android.bluetooth.gatt;

package com.android.bluetooth.gatt



/** GattService configuration. */

public class GattServiceConfig {

    public static final String TAG_PREFIX = "BtGatt.";

    public static final boolean DEBUG_ADMIN = false;

object GattServiceConfig {

    @JvmField val TAG_PREFIX = "BtGatt."

    @JvmField val DEBUG_ADMIN = false

}