diff options
| author | Dan Morrill <morrildl@google.com> | 2010-06-17 12:36:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-17 12:36:17 -0700 |
| commit | 45378f07b8c0d79fe56fc75ad25738f8750e88c8 (patch) | |
| tree | f613b09c9cff0d6ebab45d9173aa7832ec3b065d /tools | |
| parent | 42a18c09e7bb9c372382e88053409c25563ae7c9 (diff) | |
| parent | 6b22d81aa35d9a9b32670995c002e92588b2fe09 (diff) | |
| download | frameworks_base-45378f07b8c0d79fe56fc75ad25738f8750e88c8.zip frameworks_base-45378f07b8c0d79fe56fc75ad25738f8750e88c8.tar.gz frameworks_base-45378f07b8c0d79fe56fc75ad25738f8750e88c8.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 gingerbread
* 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"); |