Merge remote-tracking branch 'origin/FIX_SystemServices' into develop Fixes issue 128

pyricau · pyricau · commit 9ba2d7b922c8 · 2011-11-13T17:24:14.000+01:00
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidSystemServices.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/model/AndroidSystemServices.java
@@ -46,6 +46,15 @@ public AndroidSystemServices() {
         registeredServices.put("android.hardware.SensorManager", "android.content.Context.SENSOR_SERVICE");
         registeredServices.put("android.text.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE"); 
         registeredServices.put("android.telephony.TelephonyManager", "android.content.Context.TELEPHONY_SERVICE");        
+        registeredServices.put("android.media.AudioManager", "android.content.Context.AUDIO_SERVICE");
+        registeredServices.put("android.view.accessibility.AccessibilityManager", "android.content.Context.ACCESSIBILITY_SERVICE");
+        registeredServices.put("android.accounts.AccountManager", "android.content.Context.ACCOUNT_SERVICE");
+        registeredServices.put("android.app.WallpaperManager", "android.content.Context.WALLPAPER_SERVICE");
+        registeredServices.put("android.os.DropBoxManager", "android.content.Context.DROPBOX_SERVICE");
+        registeredServices.put("android.app.admin.DevicePolicyManager", "android.content.Context.DEVICE_POLICY_SERVICE");
+        registeredServices.put("android.os.storage.StorageManager", "android.content.Context.STORAGE_SERVICE");
+        registeredServices.put("android.nfc.NfcManager", "android.content.Context.NFC_SERVICE");
+        registeredServices.put("android.hardware.usb.UsbManager", "android.content.Context.USB_SERVICE");
     }
 
     public boolean contains(TypeMirror serviceType) {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ActivityWithServices.java b/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ActivityWithServices.java
@@ -24,6 +24,7 @@
 import android.app.SearchManager;
 import android.hardware.SensorManager;
 import android.location.LocationManager;
+import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.os.PowerManager;
@@ -87,7 +88,40 @@ public class ActivityWithServices extends Activity {
     
     @SystemService
     TelephonyManager telephonyManager;
+    
+    @SystemService
+    AudioManager audioManager;
 
+    // API level 4
+    //@SystemService
+    //AccessibilityManager accessibilityManager;
+    
+    // API Level 5
+    //@SystemService
+    //AccountManager accountManager;
+    
+    //@SystemService
+    //WallpaperManager wallpaperManager;
+    
+    // API level 8
+    //@SystemService
+    //DropBoxManager dropBoxManager;
+    
+    //@SystemService
+    //DevicePolicyManager devicePolicyManager;
+    
+    // API level 9
+    //@SystemService
+    //StorageManager storageManager;
+    
+    // API level 10
+    //@SystemService
+    //NfcManager nfcManager;    
+    
+    // API level 12
+    //@SystemService
+    //UsbManager usbManager;
+    
     // TODO Test those for > 1.5 Android versions
     // UiModeManager uiModeManager;
     // DownloadManager downloadManager;
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/com/googlecode/androidannotations/test15/ServiceInjectionTest.java b/AndroidAnnotations/functional-test-1-5/src/test/java/com/googlecode/androidannotations/test15/ServiceInjectionTest.java
@@ -45,6 +45,7 @@ public void servicesAreInjected() {
     	assertThat(activity.inputMethodManager).isNotNull();
     	assertThat(activity.sensorManager).isNotNull();
     	assertThat(activity.telephonyManager).isNotNull();
+    	assertThat(activity.audioManager).isNotNull();
     }
     
     

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public void servicesAreInjected() {`
`45`	`45`	`assertThat(activity.inputMethodManager).isNotNull();`
`46`	`46`	`assertThat(activity.sensorManager).isNotNull();`
`47`	`47`	`assertThat(activity.telephonyManager).isNotNull();`
	`48`	`+ assertThat(activity.audioManager).isNotNull();`
`48`	`49`	`}`
`49`	`50`
`50`	`51`