From 503da93330890495a7d35d2b0bd9c5f799a6b380 Mon Sep 17 00:00:00 2001 From: Csaba Kozak Date: Mon, 13 Jun 2016 18:27:25 +0200 Subject: [PATCH 1/2] Add new system services from API 23 --- .../test/ActivityWithServices.java | 20 +++++++++++++++++-- .../test/ServiceInjectionTest.java | 8 ++++++-- .../core/model/AndroidSystemServices.java | 8 ++++++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java index d208cbcbe3..a5b4418122 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java @@ -97,6 +97,10 @@ public class ActivityWithServices extends Activity { // @SystemService // CaptioningManager captioningManager; + // TODO API 23 + // @SystemService + // CarrierConfigManager carrierConfigManager; + @SystemService android.content.ClipboardManager contentClipboardManager; @@ -129,8 +133,9 @@ public class ActivityWithServices extends Activity { // @SystemService // EthernetManager ethernetManager; // hidden API + // TODO API 23 // @SystemService - // FingerprintManager fingerprintManager; // hidden API + // FingerprintManager fingerprintManager; // @SystemService // HdmiControlManager hdmiControlManager; // hidden API @@ -169,6 +174,10 @@ public class ActivityWithServices extends Activity { // TODO API 21 // @SystemService // MediaSessionManager mediaSessionManager; + + // TODO API 23 + // @SystemService + // MidiManager midiManager; // @SystemService // NetworkScoreManager networkScoreManager; // hidden API @@ -179,8 +188,9 @@ public class ActivityWithServices extends Activity { // @SystemService // NetworkPolicyManager networkPolicyManager; // hidden API + // TODO API 23 // @SystemService - // NetworkStatsService networkStatsService; // hidden API + // NetworkStatsManager networkStatsManager; @SystemService NfcManager nfcManager; @@ -240,6 +250,9 @@ public class ActivityWithServices extends Activity { // @SystemService // ThrottleManager throttleManager; // hidden API + // @SystemService + // TrustManager trustManager; // hidden API + // TODO API 21 // @SystemService // TvInputManager tvInputManager; @@ -276,6 +289,9 @@ public class ActivityWithServices extends Activity { @SystemService WifiP2pManager wifiP2pManager; + // @SystemService + // RttManager rttManager; // hidden API + @SystemService WindowManager windowManager; diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java index aea23fd9c0..b3cc013abe 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java @@ -49,6 +49,7 @@ public void servicesAreInjected() { // assertThat(activity.bluetoothManager).isNotNull(); // TODO API 18 // assertThat(activity.cameraManager).isNotNull(); // hidden API // assertThat(activity.captioningManager).isNotNull(); // TODO API 19 + // assertThat(activity.carrierConfigManager).isNotNull(); // TODO API 23 assertThat(activity.contentClipboardManager).isNotNull(); assertThat(activity.textClipboardManager).isNotNull(); assertThat(activity.connectivityManager).isNotNull(); @@ -59,7 +60,7 @@ public void servicesAreInjected() { assertThat(activity.downloadManager).isNotNull(); assertThat(activity.dropBoxManager).isNotNull(); // assertThat(activity.ethernetManager).isNotNull(); // hidden API - // assertThat(activity.fingerprintManager).isNotNull(); // hidden API + // assertThat(activity.fingerprintManager).isNotNull(); // TODO API 23 // assertThat(activity.hdmiControlManager).isNotNull(); // hidden API // assertThat(activity.inputManager).isNotNull(); // TODO no support yet in Robolectric assertThat(activity.inputMethodManager).isNotNull(); @@ -71,10 +72,11 @@ public void servicesAreInjected() { // assertThat(activity.mediaProjectionManager).isNotNull(); // TODO API 21 assertThat(activity.mediaRouter).isNotNull(); // assertThat(activity.mediaSessionManager).isNotNull(); // TODO API 21 + // assertThat(activity.midiManager).isNotNull(); // TODO API 23 // assertThat(activity.networkScoreManager).isNotNull(); // hidden API // assertThat(activity.networkManagementService).isNotNull(); // hidden API // assertThat(activity.networkPolicyManager).isNotNull(); // hidden API - // assertThat(activity.networkStatsService).isNotNull(); // hidden API + // assertThat(activity.networkStatsManager).isNotNull(); // TODO API 23 // assertThat(activity.nfcManager).isNotNull(); // TODO no support yet in Robolectric assertThat(activity.notificationManager).isNotNull(); // assertThat(activity.nsdManager).isNotNull(); // TODO no support yet in Robolectric @@ -93,6 +95,7 @@ public void servicesAreInjected() { assertThat(activity.telephonyManager).isNotNull(); assertThat(activity.textServicesManager).isNotNull(); // assertThat(activity.throttleManager).isNotNull(); // hidden API + // assertThat(activity.trustManager).isNotNull(); // hidden API // assertThat(activity.tvInputManager).isNotNull(); // TODO API 21 assertThat(activity.uiModeManager).isNotNull(); // assertThat(activity.updateLock).isNotNull(); // hidden API @@ -104,6 +107,7 @@ public void servicesAreInjected() { assertThat(activity.wifiManager).isNotNull(); // assertThat(activity.wifiPasspointManager).isNotNull(); // hidden API // assertThat(activity.wifiP2pManager).isNotNull(); // TODO no support yet in Robolectric + // assertThat(activity.rttManager).isNotNull(); // hidden API assertThat(activity.windowManager).isNotNull(); } diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java index 1831e42e8c..155f8a528c 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java @@ -44,6 +44,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) { registeredServices.put("android.bluetooth.BluetoothManager", "android.content.Context.BLUETOOTH_SERVICE"); registeredServices.put("android.hardware.camera2.CameraManager", "android.content.Context.CAMERA_SERVICE"); registeredServices.put("android.view.accessibility.CaptioningManager", "android.content.Context.CAPTIONING_SERVICE"); + registeredServices.put("android.telephony.CarrierConfigManager", "android.content.Context.CARRIER_CONFIG_SERVICE"); registeredServices.put("android.content.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE"); registeredServices.put("android.text.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE"); registeredServices.put("android.net.ConnectivityManager", "android.content.Context.CONNECTIVITY_SERVICE"); @@ -54,7 +55,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) { registeredServices.put("android.app.DownloadManager", "android.content.Context.DOWNLOAD_SERVICE"); registeredServices.put("android.os.DropBoxManager", "android.content.Context.DROPBOX_SERVICE"); registeredServices.put("android.net.EthernetManager", "android.content.Context.ETHERNET_SERVICE"); - registeredServices.put("android.service.fingerprint.FingerprintManager", "android.content.Context.FINGERPRINT_SERVICE"); + registeredServices.put("android.hardware.fingerprint.FingerprintManager", "android.content.Context.FINGERPRINT_SERVICE"); registeredServices.put("android.hardware.hdmi.HdmiControlManager", "android.content.Context.HDMI_CONTROL_SERVICE"); registeredServices.put("android.hardware.input.InputManager", "android.content.Context.INPUT_SERVICE"); registeredServices.put("android.view.inputmethod.InputMethodManager", "android.content.Context.INPUT_METHOD_SERVICE"); @@ -66,10 +67,11 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) { registeredServices.put("android.media.projection.MediaProjectionManager", "android.content.Context.MEDIA_PROJECTION_SERVICE"); registeredServices.put("android.media.MediaRouter", "android.content.Context.MEDIA_ROUTER_SERVICE"); registeredServices.put("android.media.session.MediaSessionManager", "android.content.Context.MEDIA_SESSION_SERVICE"); + registeredServices.put("android.media.midi.MidiManager", "android.content.Context.MIDI_SERVICE"); registeredServices.put("android.net.NetworkScoreManager", "android.content.Context.NETWORK_SCORE_SERVICE"); registeredServices.put("android.net.NetworkManagementService", "android.content.Context.NETWORKMANAGEMENT_SERVICE"); registeredServices.put("android.net.NetworkPolicyManager", "android.content.Context.NETWORK_POLICY_SERVICE"); - registeredServices.put("android.net.NetworkStatsService", "android.content.Context.NETWORK_STATS_SERVICE"); + registeredServices.put("android.app.usage.NetworkStatsManager", "android.content.Context.NETWORK_STATS_SERVICE"); registeredServices.put("android.nfc.NfcManager", "android.content.Context.NFC_SERVICE"); registeredServices.put("android.app.NotificationManager", "android.content.Context.NOTIFICATION_SERVICE"); registeredServices.put("android.net.nsd.NsdManager", "android.content.Context.NSD_SERVICE"); @@ -88,6 +90,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) { registeredServices.put("android.telephony.TelephonyManager", "android.content.Context.TELEPHONY_SERVICE"); registeredServices.put("android.view.textservice.TextServicesManager", "android.content.Context.TEXT_SERVICES_MANAGER_SERVICE"); registeredServices.put("android.net.ThrottleManager", "android.content.Context.THROTTLE_SERVICE"); + registeredServices.put("android.app.trust.TrustManager", "android.content.Context.TRUST_SERVICE"); registeredServices.put("android.media.tv.TvInputManager", "android.content.Context.TV_INPUT_SERVICE"); registeredServices.put("android.app.UiModeManager", "android.content.Context.UI_MODE_SERVICE"); registeredServices.put("android.os.IUpdateLock", "android.content.Context.UPDATE_LOCK_SERVICE"); @@ -99,6 +102,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) { registeredServices.put("android.net.wifi.WifiManager", "android.content.Context.WIFI_SERVICE"); registeredServices.put("android.net.wifi.passpoint.WifiPasspointManager", "android.content.Context.WIFI_PASSPOINT_SERVICE"); registeredServices.put("android.net.wifi.p2p.WifiP2pManager", "android.content.Context.WIFI_P2P_SERVICE"); + registeredServices.put("android.net.wifi.RttManager", "android.content.Context.WIFI_RTT_SERVICE"); registeredServices.put("android.view.WindowManager", "android.content.Context.WINDOW_SERVICE"); } From 134565dffe8dd5982b77ff686fda8728e2f58d36 Mon Sep 17 00:00:00 2001 From: Csaba Kozak Date: Sun, 17 Jul 2016 11:42:55 +0200 Subject: [PATCH 2/2] Add new system services from API 24 --- .../org/androidannotations/test/ActivityWithServices.java | 8 ++++++++ .../org/androidannotations/test/ServiceInjectionTest.java | 2 ++ .../internal/core/model/AndroidSystemServices.java | 2 ++ 3 files changed, 12 insertions(+) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java index a5b4418122..b1d62ee4a4 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java @@ -137,6 +137,10 @@ public class ActivityWithServices extends Activity { // @SystemService // FingerprintManager fingerprintManager; + // TODO API 24 + // @SystemService + // HardwarePropertiesManager hardwarePropertiesManager; + // @SystemService // HdmiControlManager hdmiControlManager; // hidden API @@ -236,6 +240,10 @@ public class ActivityWithServices extends Activity { // TODO API 22 // @SystemService // SubscriptionManager subscriptionManager; + + // TODO API 24 + // @SystemService + // SystemHealthManager systemHealthManager; // TODO API 21 // @SystemService diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java index b3cc013abe..452ba93fad 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java @@ -61,6 +61,7 @@ public void servicesAreInjected() { assertThat(activity.dropBoxManager).isNotNull(); // assertThat(activity.ethernetManager).isNotNull(); // hidden API // assertThat(activity.fingerprintManager).isNotNull(); // TODO API 23 + // assertThat(activity.hardwarePropertiesManager).isNotNull(); // TODO API 24 // assertThat(activity.hdmiControlManager).isNotNull(); // hidden API // assertThat(activity.inputManager).isNotNull(); // TODO no support yet in Robolectric assertThat(activity.inputMethodManager).isNotNull(); @@ -91,6 +92,7 @@ public void servicesAreInjected() { // assertThat(activity.statusBarManager).isNotNull(); // hidden API assertThat(activity.storageManager).isNotNull(); // assertThat(activity.subscriptionManager).isNotNull(); // TODO API 22 + // assertThat(activity.systemHealthManager).isNotNull(); // TODO API 24 // assertThat(activity.telecomManager).isNotNull(); // TODO API 21 assertThat(activity.telephonyManager).isNotNull(); assertThat(activity.textServicesManager).isNotNull(); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java index 155f8a528c..de7b3fe998 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java @@ -56,6 +56,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) { registeredServices.put("android.os.DropBoxManager", "android.content.Context.DROPBOX_SERVICE"); registeredServices.put("android.net.EthernetManager", "android.content.Context.ETHERNET_SERVICE"); registeredServices.put("android.hardware.fingerprint.FingerprintManager", "android.content.Context.FINGERPRINT_SERVICE"); + registeredServices.put("android.os.HardwarePropertiesManager", "android.content.Context.HARDWARE_PROPERTIES_SERVICE"); registeredServices.put("android.hardware.hdmi.HdmiControlManager", "android.content.Context.HDMI_CONTROL_SERVICE"); registeredServices.put("android.hardware.input.InputManager", "android.content.Context.INPUT_SERVICE"); registeredServices.put("android.view.inputmethod.InputMethodManager", "android.content.Context.INPUT_METHOD_SERVICE"); @@ -86,6 +87,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) { registeredServices.put("android.app.StatusBarManager", "android.content.Context.STATUS_BAR_SERVICE"); registeredServices.put("android.os.storage.StorageManager", "android.content.Context.STORAGE_SERVICE"); registeredServices.put("android.telephony.SubscriptionManager", "android.content.Context.TELEPHONY_SUBSCRIPTION_SERVICE"); + registeredServices.put("android.os.health.SystemHealthManager", "android.content.Context.SYSTEM_HEALTH_SERVICE"); registeredServices.put("android.telecom.TelecomManager", "android.content.Context.TELECOM_SERVICE"); registeredServices.put("android.telephony.TelephonyManager", "android.content.Context.TELEPHONY_SERVICE"); registeredServices.put("android.view.textservice.TextServicesManager", "android.content.Context.TEXT_SERVICES_MANAGER_SERVICE");