commit a1b6dba25f5dcac6bb4b1e5c8b7d330d08385250
author Dan Morrill <morrildl@google.com> Thu Jun 17 12:45:53 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 17 12:45:53 2010 -0700
tree 80e5cf0b068ce4ddf012efcd9fccb4d6e6bfeedb
parent a05d4d886a1b0441e056f89d40e297b14f27478a
parent dde1ae841ab77c4c0b3ef9bb25849314554a6ad7

am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.

Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'

* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 1e8b395..83057b8 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -1000,7 +1000,7 @@
             }
 
             // Bluetooth-related compatibility logic
-            if (!specBluetoothFeature && hasBluetoothPermission) {
+            if (!specBluetoothFeature && hasBluetoothPermission && (targetSdk > 4)) {
                 // if app takes a Bluetooth permission but does not request the Bluetooth
                 // feature, we infer that it meant to
                 printf("uses-feature:'android.hardware.bluetooth'\n");