diff options
| author | Rohit Singh <singhr@codeaurora.org> | 2014-12-11 18:02:07 -0800 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2015-01-22 00:57:54 +0100 |
| commit | 431317503bc4fc34507d2cd42d64505de016e210 (patch) | |
| tree | 1a8fef40885ca13eabf40df9895cd61870774fce | |
| parent | 7874437ea3533000b25b1f42c2ba2f4ee801f224 (diff) | |
| download | android_packages_apps_BluetoothExt-431317503bc4fc34507d2cd42d64505de016e210.tar.gz android_packages_apps_BluetoothExt-431317503bc4fc34507d2cd42d64505de016e210.tar.bz2 android_packages_apps_BluetoothExt-431317503bc4fc34507d2cd42d64505de016e210.zip | |
Bluetooth-wipower: Flag based A4WP enabling.
wipower flag is been added to the board specific config
file, So that the A4WP can be enabled based on this flag.
This patch removes A4WP from android Manifest file
Change-Id: I92dc6e118eb4614966a82c2e1c5e47a7be228b7d
CRs-fixed: 770519
| -rw-r--r-- | Android.mk | 11 | ||||
| -rw-r--r-- | AndroidManifest.xml | 17 |
2 files changed, 10 insertions, 18 deletions
@@ -8,8 +8,11 @@ src_dirs:= src/org/codeaurora/bluetooth/btcservice \ src/org/codeaurora/bluetooth/ftp \ src/org/codeaurora/bluetooth/dun \ src/org/codeaurora/bluetooth/sap \ - src/org/codeaurora/bluetooth/pxpservice \ - #src/org/codeaurora/bluetooth/a4wp + src/org/codeaurora/bluetooth/pxpservice + +ifeq ($(BOARD_USES_WIPOWER),true) + src_dirs += src/org/codeaurora/bluetooth/a4wp +endif LOCAL_SRC_FILES := \ $(call all-java-files-under, $(src_dirs)) \ @@ -20,7 +23,9 @@ LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := javax.obex LOCAL_JAVA_LIBRARIES += mms-common LOCAL_JAVA_LIBRARIES += telephony-common -#LOCAL_JAVA_LIBRARIES += com.quicinc.wbc +ifeq ($(BOARD_USES_WIPOWER),true) + LOCAL_JAVA_LIBRARIES += com.quicinc.wbc +endif LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 21d156b..b83c1a1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -186,20 +186,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <action android:name="org.codeaurora.bluetooth.pxpservice.PxpMonitorService" /> </intent-filter> </service> -<!-- - <service - android:process="@string/process" - android:exported="true" - android:name = ".a4wp.A4wpService"> - </service> - <receiver - android:process="@string/process" - android:exported="true" - android:name=".a4wp.BTEventHandler"> - <intent-filter> - <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" /> - </intent-filter> - </receiver> ---> + + </application> </manifest> |