Merge "Update the @ServiceName annotation" (65528280) · Commits · e / os / android_frameworks_base

core/java/android/content/Context.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -2149,17 +2149,21 @@ public abstract class Context {
		WIFI_PASSPOINT_SERVICE,
		WIFI_P2P_SERVICE,
		WIFI_SCANNING_SERVICE,
		//@hide: WIFI_RTT_SERVICE,
		//@hide: ETHERNET_SERVICE,
		WIFI_RTT_SERVICE,
		NSD_SERVICE,
		AUDIO_SERVICE,
		//@hide: FINGERPRINT_SERVICE,
		MEDIA_ROUTER_SERVICE,
		TELEPHONY_SERVICE,
		TELEPHONY_SUBSCRIPTION_SERVICE,
		TELECOM_SERVICE,
		CLIPBOARD_SERVICE,
		INPUT_METHOD_SERVICE,
		TEXT_SERVICES_MANAGER_SERVICE,
		APPWIDGET_SERVICE,
		//@hide: VOICE_INTERACTION_MANAGER_SERVICE,
		//@hide: BACKUP_SERVICE,
		DROPBOX_SERVICE,
		DEVICE_POLICY_SERVICE,
		@@ -2171,16 +2175,23 @@ public abstract class Context {
		USB_SERVICE,
		LAUNCHER_APPS_SERVICE,
		//@hide: SERIAL_SERVICE,
		//@hide: HDMI_CONTROL_SERVICE,
		INPUT_SERVICE,
		DISPLAY_SERVICE,
		//@hide: SCHEDULING_POLICY_SERVICE,
		USER_SERVICE,
		//@hide: APP_OPS_SERVICE
		RESTRICTIONS_SERVICE,
		APP_OPS_SERVICE,
		CAMERA_SERVICE,
		PRINT_SERVICE,
		CONSUMER_IR_SERVICE,
		//@hide: TRUST_SERVICE,
		TV_INPUT_SERVICE,
		//@hide: NETWORK_SCORE_SERVICE,
		USAGE_STATS_SERVICE,
		MEDIA_SESSION_SERVICE,
		BATTERY_SERVICE,
		JOB_SCHEDULER_SERVICE,
		//@hide: PERSISTENT_DATA_BLOCK_SERVICE,
		MEDIA_PROJECTION_SERVICE,
		MIDI_SERVICE,
		})