summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDan Morrill <morrildl@google.com>2010-06-15 21:41:42 -0700
committerDan Morrill <morrildl@google.com>2010-06-15 21:57:33 -0700
commit6b22d81aa35d9a9b32670995c002e92588b2fe09 (patch)
tree022af27d83c23fabe4f594b5e4b58ab5e936a5d2 /tools
parentcdeae439a3637062dc0701654a1cb7874bfd1ae8 (diff)
downloadframeworks_base-6b22d81aa35d9a9b32670995c002e92588b2fe09.zip
frameworks_base-6b22d81aa35d9a9b32670995c002e92588b2fe09.tar.gz
frameworks_base-6b22d81aa35d9a9b32670995c002e92588b2fe09.tar.bz2
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. Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/Command.cpp2
1 files changed, 1 insertions, 1 deletions
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 @@ int doDump(Bundle* bundle)
}
// 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");