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

Commit 9e01074f authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Remove sysprop/pan.sysprop" into main am: 14f2ca8b 

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



Change-Id: I5f6ea7737b7c408c9e057352ccc2e244342e2ab5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d218b2ac 14f2ca8b

sysprop/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ sysprop_library { 
        "ble.sysprop",

        "bta.sysprop",

        "hfp.sysprop",

        "pan.sysprop",

    ],

    property_owner: "Platform",

    api_packages: ["android.sysprop"],

sysprop/exported_include/android_bluetooth_sysprop.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <ble.sysprop.h>

#include <bta.sysprop.h>

#include <hfp.sysprop.h>

#include <pan.sysprop.h>



#define GET_SYSPROP(namespace, prop, default) \

  android::sysprop::bluetooth::namespace ::prop().value_or(default)

sysprop/pan.sysprop

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
module: "android.sysprop.bluetooth.Pan"

owner: Platform



prop {

    api_name: "nap"

    type: Boolean

    scope: Internal

    access: Readonly

    prop_name: "bluetooth.pan.nap.enabled"

}

system/btif/src/btif_pan.cc

+8 −1
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ 
#include "stack/include/pan_api.h"

#include "types/raw_address.h"



#ifdef __ANDROID__

#include <android/sysprop/BluetoothProperties.sysprop.h>

#endif



#define FORWARD_IGNORE 1

#define FORWARD_SUCCESS 0

#define FORWARD_FAILURE (-1)
@@ -119,9 +123,12 @@ void btif_pan_init() { 
    btpan_cb.enabled = 1;



    int role = BTPAN_ROLE_NONE;

    if (GET_SYSPROP(Pan, nap, true)) {

#ifdef __ANDROID__

    if (android::sysprop::BluetoothProperties::isProfilePanNapEnabled()

            .value_or(false)) {

      role |= BTPAN_ROLE_PANNAP;

    }

#endif

    role |= BTPAN_ROLE_PANU;

    btpan_enable(role);

  }