diff options
| -rw-r--r-- | sysprop/Android.bp | 1 | ||||
| -rw-r--r-- | sysprop/exported_include/android_bluetooth_sysprop.h | 1 | ||||
| -rw-r--r-- | sysprop/pan.sysprop | 10 | ||||
| -rw-r--r-- | system/btif/src/btif_pan.cc | 9 |
4 files changed, 8 insertions, 13 deletions
diff --git a/sysprop/Android.bp b/sysprop/Android.bp index 76750c9220..b399a8d7b8 100644 --- a/sysprop/Android.bp +++ b/sysprop/Android.bp @@ -11,7 +11,6 @@ sysprop_library { "ble.sysprop", "bta.sysprop", "hfp.sysprop", - "pan.sysprop", ], property_owner: "Platform", api_packages: ["android.sysprop"], diff --git a/sysprop/exported_include/android_bluetooth_sysprop.h b/sysprop/exported_include/android_bluetooth_sysprop.h index 3a3ccda8fe..3e76262114 100644 --- a/sysprop/exported_include/android_bluetooth_sysprop.h +++ b/sysprop/exported_include/android_bluetooth_sysprop.h @@ -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) diff --git a/sysprop/pan.sysprop b/sysprop/pan.sysprop deleted file mode 100644 index fa64bb3856..0000000000 --- a/sysprop/pan.sysprop +++ /dev/null @@ -1,10 +0,0 @@ -module: "android.sysprop.bluetooth.Pan" -owner: Platform - -prop { - api_name: "nap" - type: Boolean - scope: Internal - access: Readonly - prop_name: "bluetooth.pan.nap.enabled" -} diff --git a/system/btif/src/btif_pan.cc b/system/btif/src/btif_pan.cc index cc07f835e3..9429a58eb0 100644 --- a/system/btif/src/btif_pan.cc +++ b/system/btif/src/btif_pan.cc @@ -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); } |