set up fast-forward from froyo-release to gingerbread

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index 1e8b395b03e071ef1806cc02a6e7d7fdc0170603..83057b8ab2bf4e0741c1a2feb290f3e5dabc0188 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -1000,7 +1000,7 @@ int doDump(Bundle* bundle)
             }
 
             // Bluetooth-related compatibility logic
             }
 
             // 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");
                 // 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");