diff options
| author | Dan Morrill <morrildl@google.com> | 2010-06-17 12:23:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-17 12:23:03 -0700 |
| commit | 56a5ee3325fb0cf77b4188df79d12553c72b2ec6 (patch) | |
| tree | d49cc60b831114726a8d0a4ea82cff544b2af54e /tools | |
| parent | b846393dc9b3408a38100aacd7b97c6965403935 (diff) | |
| parent | 6b22d81aa35d9a9b32670995c002e92588b2fe09 (diff) | |
| download | frameworks_base-56a5ee3325fb0cf77b4188df79d12553c72b2ec6.zip frameworks_base-56a5ee3325fb0cf77b4188df79d12553c72b2ec6.tar.gz frameworks_base-56a5ee3325fb0cf77b4188df79d12553c72b2ec6.tar.bz2 | |
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 '6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp
* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Command.cpp | 2 |
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"); |