Skip to content

Commit c7786ac

Browse files
WonderCsaboWonderCsabo
authored
Merge pull request androidannotations#1799 from WonderCsabo/1797_newSystemServices
Add new system services from API 23 and 24
2 parents 9722f54 + 134565d commit c7786ac

3 files changed

Lines changed: 42 additions & 6 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ public class ActivityWithServices extends Activity {
9797
// @SystemService
9898
// CaptioningManager captioningManager;
9999

100+
// TODO API 23
101+
// @SystemService
102+
// CarrierConfigManager carrierConfigManager;
103+
100104
@SystemService
101105
android.content.ClipboardManager contentClipboardManager;
102106

@@ -129,8 +133,13 @@ public class ActivityWithServices extends Activity {
129133
// @SystemService
130134
// EthernetManager ethernetManager; // hidden API
131135

136+
// TODO API 23
137+
// @SystemService
138+
// FingerprintManager fingerprintManager;
139+
140+
// TODO API 24
132141
// @SystemService
133-
// FingerprintManager fingerprintManager; // hidden API
142+
// HardwarePropertiesManager hardwarePropertiesManager;
134143

135144
// @SystemService
136145
// HdmiControlManager hdmiControlManager; // hidden API
@@ -169,6 +178,10 @@ public class ActivityWithServices extends Activity {
169178
// TODO API 21
170179
// @SystemService
171180
// MediaSessionManager mediaSessionManager;
181+
182+
// TODO API 23
183+
// @SystemService
184+
// MidiManager midiManager;
172185

173186
// @SystemService
174187
// NetworkScoreManager networkScoreManager; // hidden API
@@ -179,8 +192,9 @@ public class ActivityWithServices extends Activity {
179192
// @SystemService
180193
// NetworkPolicyManager networkPolicyManager; // hidden API
181194

195+
// TODO API 23
182196
// @SystemService
183-
// NetworkStatsService networkStatsService; // hidden API
197+
// NetworkStatsManager networkStatsManager;
184198

185199
@SystemService
186200
NfcManager nfcManager;
@@ -226,6 +240,10 @@ public class ActivityWithServices extends Activity {
226240
// TODO API 22
227241
// @SystemService
228242
// SubscriptionManager subscriptionManager;
243+
244+
// TODO API 24
245+
// @SystemService
246+
// SystemHealthManager systemHealthManager;
229247

230248
// TODO API 21
231249
// @SystemService
@@ -240,6 +258,9 @@ public class ActivityWithServices extends Activity {
240258
// @SystemService
241259
// ThrottleManager throttleManager; // hidden API
242260

261+
// @SystemService
262+
// TrustManager trustManager; // hidden API
263+
243264
// TODO API 21
244265
// @SystemService
245266
// TvInputManager tvInputManager;
@@ -276,6 +297,9 @@ public class ActivityWithServices extends Activity {
276297
@SystemService
277298
WifiP2pManager wifiP2pManager;
278299

300+
// @SystemService
301+
// RttManager rttManager; // hidden API
302+
279303
@SystemService
280304
WindowManager windowManager;
281305

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void servicesAreInjected() {
4949
// assertThat(activity.bluetoothManager).isNotNull(); // TODO API 18
5050
// assertThat(activity.cameraManager).isNotNull(); // hidden API
5151
// assertThat(activity.captioningManager).isNotNull(); // TODO API 19
52+
// assertThat(activity.carrierConfigManager).isNotNull(); // TODO API 23
5253
assertThat(activity.contentClipboardManager).isNotNull();
5354
assertThat(activity.textClipboardManager).isNotNull();
5455
assertThat(activity.connectivityManager).isNotNull();
@@ -59,7 +60,8 @@ public void servicesAreInjected() {
5960
assertThat(activity.downloadManager).isNotNull();
6061
assertThat(activity.dropBoxManager).isNotNull();
6162
// assertThat(activity.ethernetManager).isNotNull(); // hidden API
62-
// assertThat(activity.fingerprintManager).isNotNull(); // hidden API
63+
// assertThat(activity.fingerprintManager).isNotNull(); // TODO API 23
64+
// assertThat(activity.hardwarePropertiesManager).isNotNull(); // TODO API 24
6365
// assertThat(activity.hdmiControlManager).isNotNull(); // hidden API
6466
// assertThat(activity.inputManager).isNotNull(); // TODO no support yet in Robolectric
6567
assertThat(activity.inputMethodManager).isNotNull();
@@ -71,10 +73,11 @@ public void servicesAreInjected() {
7173
// assertThat(activity.mediaProjectionManager).isNotNull(); // TODO API 21
7274
assertThat(activity.mediaRouter).isNotNull();
7375
// assertThat(activity.mediaSessionManager).isNotNull(); // TODO API 21
76+
// assertThat(activity.midiManager).isNotNull(); // TODO API 23
7477
// assertThat(activity.networkScoreManager).isNotNull(); // hidden API
7578
// assertThat(activity.networkManagementService).isNotNull(); // hidden API
7679
// assertThat(activity.networkPolicyManager).isNotNull(); // hidden API
77-
// assertThat(activity.networkStatsService).isNotNull(); // hidden API
80+
// assertThat(activity.networkStatsManager).isNotNull(); // TODO API 23
7881
// assertThat(activity.nfcManager).isNotNull(); // TODO no support yet in Robolectric
7982
assertThat(activity.notificationManager).isNotNull();
8083
// assertThat(activity.nsdManager).isNotNull(); // TODO no support yet in Robolectric
@@ -89,10 +92,12 @@ public void servicesAreInjected() {
8992
// assertThat(activity.statusBarManager).isNotNull(); // hidden API
9093
assertThat(activity.storageManager).isNotNull();
9194
// assertThat(activity.subscriptionManager).isNotNull(); // TODO API 22
95+
// assertThat(activity.systemHealthManager).isNotNull(); // TODO API 24
9296
// assertThat(activity.telecomManager).isNotNull(); // TODO API 21
9397
assertThat(activity.telephonyManager).isNotNull();
9498
assertThat(activity.textServicesManager).isNotNull();
9599
// assertThat(activity.throttleManager).isNotNull(); // hidden API
100+
// assertThat(activity.trustManager).isNotNull(); // hidden API
96101
// assertThat(activity.tvInputManager).isNotNull(); // TODO API 21
97102
assertThat(activity.uiModeManager).isNotNull();
98103
// assertThat(activity.updateLock).isNotNull(); // hidden API
@@ -104,6 +109,7 @@ public void servicesAreInjected() {
104109
assertThat(activity.wifiManager).isNotNull();
105110
// assertThat(activity.wifiPasspointManager).isNotNull(); // hidden API
106111
// assertThat(activity.wifiP2pManager).isNotNull(); // TODO no support yet in Robolectric
112+
// assertThat(activity.rttManager).isNotNull(); // hidden API
107113
assertThat(activity.windowManager).isNotNull();
108114
}
109115

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) {
4444
registeredServices.put("android.bluetooth.BluetoothManager", "android.content.Context.BLUETOOTH_SERVICE");
4545
registeredServices.put("android.hardware.camera2.CameraManager", "android.content.Context.CAMERA_SERVICE");
4646
registeredServices.put("android.view.accessibility.CaptioningManager", "android.content.Context.CAPTIONING_SERVICE");
47+
registeredServices.put("android.telephony.CarrierConfigManager", "android.content.Context.CARRIER_CONFIG_SERVICE");
4748
registeredServices.put("android.content.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE");
4849
registeredServices.put("android.text.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE");
4950
registeredServices.put("android.net.ConnectivityManager", "android.content.Context.CONNECTIVITY_SERVICE");
@@ -54,7 +55,8 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) {
5455
registeredServices.put("android.app.DownloadManager", "android.content.Context.DOWNLOAD_SERVICE");
5556
registeredServices.put("android.os.DropBoxManager", "android.content.Context.DROPBOX_SERVICE");
5657
registeredServices.put("android.net.EthernetManager", "android.content.Context.ETHERNET_SERVICE");
57-
registeredServices.put("android.service.fingerprint.FingerprintManager", "android.content.Context.FINGERPRINT_SERVICE");
58+
registeredServices.put("android.hardware.fingerprint.FingerprintManager", "android.content.Context.FINGERPRINT_SERVICE");
59+
registeredServices.put("android.os.HardwarePropertiesManager", "android.content.Context.HARDWARE_PROPERTIES_SERVICE");
5860
registeredServices.put("android.hardware.hdmi.HdmiControlManager", "android.content.Context.HDMI_CONTROL_SERVICE");
5961
registeredServices.put("android.hardware.input.InputManager", "android.content.Context.INPUT_SERVICE");
6062
registeredServices.put("android.view.inputmethod.InputMethodManager", "android.content.Context.INPUT_METHOD_SERVICE");
@@ -66,10 +68,11 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) {
6668
registeredServices.put("android.media.projection.MediaProjectionManager", "android.content.Context.MEDIA_PROJECTION_SERVICE");
6769
registeredServices.put("android.media.MediaRouter", "android.content.Context.MEDIA_ROUTER_SERVICE");
6870
registeredServices.put("android.media.session.MediaSessionManager", "android.content.Context.MEDIA_SESSION_SERVICE");
71+
registeredServices.put("android.media.midi.MidiManager", "android.content.Context.MIDI_SERVICE");
6972
registeredServices.put("android.net.NetworkScoreManager", "android.content.Context.NETWORK_SCORE_SERVICE");
7073
registeredServices.put("android.net.NetworkManagementService", "android.content.Context.NETWORKMANAGEMENT_SERVICE");
7174
registeredServices.put("android.net.NetworkPolicyManager", "android.content.Context.NETWORK_POLICY_SERVICE");
72-
registeredServices.put("android.net.NetworkStatsService", "android.content.Context.NETWORK_STATS_SERVICE");
75+
registeredServices.put("android.app.usage.NetworkStatsManager", "android.content.Context.NETWORK_STATS_SERVICE");
7376
registeredServices.put("android.nfc.NfcManager", "android.content.Context.NFC_SERVICE");
7477
registeredServices.put("android.app.NotificationManager", "android.content.Context.NOTIFICATION_SERVICE");
7578
registeredServices.put("android.net.nsd.NsdManager", "android.content.Context.NSD_SERVICE");
@@ -84,10 +87,12 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) {
8487
registeredServices.put("android.app.StatusBarManager", "android.content.Context.STATUS_BAR_SERVICE");
8588
registeredServices.put("android.os.storage.StorageManager", "android.content.Context.STORAGE_SERVICE");
8689
registeredServices.put("android.telephony.SubscriptionManager", "android.content.Context.TELEPHONY_SUBSCRIPTION_SERVICE");
90+
registeredServices.put("android.os.health.SystemHealthManager", "android.content.Context.SYSTEM_HEALTH_SERVICE");
8791
registeredServices.put("android.telecom.TelecomManager", "android.content.Context.TELECOM_SERVICE");
8892
registeredServices.put("android.telephony.TelephonyManager", "android.content.Context.TELEPHONY_SERVICE");
8993
registeredServices.put("android.view.textservice.TextServicesManager", "android.content.Context.TEXT_SERVICES_MANAGER_SERVICE");
9094
registeredServices.put("android.net.ThrottleManager", "android.content.Context.THROTTLE_SERVICE");
95+
registeredServices.put("android.app.trust.TrustManager", "android.content.Context.TRUST_SERVICE");
9196
registeredServices.put("android.media.tv.TvInputManager", "android.content.Context.TV_INPUT_SERVICE");
9297
registeredServices.put("android.app.UiModeManager", "android.content.Context.UI_MODE_SERVICE");
9398
registeredServices.put("android.os.IUpdateLock", "android.content.Context.UPDATE_LOCK_SERVICE");
@@ -99,6 +104,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) {
99104
registeredServices.put("android.net.wifi.WifiManager", "android.content.Context.WIFI_SERVICE");
100105
registeredServices.put("android.net.wifi.passpoint.WifiPasspointManager", "android.content.Context.WIFI_PASSPOINT_SERVICE");
101106
registeredServices.put("android.net.wifi.p2p.WifiP2pManager", "android.content.Context.WIFI_P2P_SERVICE");
107+
registeredServices.put("android.net.wifi.RttManager", "android.content.Context.WIFI_RTT_SERVICE");
102108
registeredServices.put("android.view.WindowManager", "android.content.Context.WINDOW_SERVICE");
103109
}
104110

0 commit comments

Comments
 (0)