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 '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp

* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
This commit is contained in:
Dan Morrill
2010-06-17 12:42:14 -07:00
committed by Android Git Automerger

View File

@@ -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");