Skip to content

Commit bdb4b46

Browse files
WonderCsaboWonderCsabo
committed
Fix BLUETOOTH_SERVICE injection
Due to a documentation error we now want to inject BluetoothAdapter for this constant, but the right class is BluetoothManager. https://code.google.com/p/android/issues/detail?id=62866
1 parent 7c0ec68 commit bdb4b46

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public AndroidSystemServices() {
3838
registeredServices.put("android.appwidget.AppWidgetManager", "android.content.Context.APPWIDGET_SERVICE");
3939
registeredServices.put("android.media.AudioManager", "android.content.Context.AUDIO_SERVICE");
4040
registeredServices.put("android.app.backup.IBackupManager", "android.content.Context.BACKUP_SERVICE");
41-
registeredServices.put("android.bluetooth.BluetoothAdapter", "android.content.Context.BLUETOOTH_SERVICE");
41+
registeredServices.put("android.bluetooth.BluetoothManager", "android.content.Context.BLUETOOTH_SERVICE");
4242
registeredServices.put("android.hardware.camera2.CameraManager", "android.content.Context.CAMERA_SERVICE");
4343
registeredServices.put("android.view.accessibility.CaptioningManager", "android.content.Context.CAPTIONING_SERVICE");
4444
registeredServices.put("android.content.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE");

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class ActivityWithServices extends Activity {
8383

8484
// TODO API 18
8585
// @SystemService
86-
// BluetoothAdapter bluetoothAdapter;
86+
// BluetoothManager bluetoothManager;
8787

8888
// @SystemService
8989
// CameraManager cameraManager; // hidden API

‎AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void servicesAreInjected() {
3939
// assertThat(activity.appWidgetManager).isNotNull(); // hidden API
4040
assertThat(activity.audioManager).isNotNull();
4141
// assertThat(activity.backupManager).isNotNull(); // hidden API
42-
// assertThat(activity.bluetoothAdapter).isNotNull(); // TODO API 18
42+
// assertThat(activity.bluetoothManager).isNotNull(); // TODO API 18
4343
// assertThat(activity.cameraManager).isNotNull(); // hidden API
4444
// assertThat(activity.captioningManager).isNotNull(); // TODO API 19
4545
assertThat(activity.contentClipboardManager).isNotNull();

0 commit comments

Comments
 (0)