Merge "Telephony light grey list clean up for Q" am: 71ca860ff7 am: 0daf5ca480 (7cf6b046) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/PhoneStateListener.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.annotation.RequiresPermission;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.annotation.UnsupportedAppUsage;		import android.annotation.UnsupportedAppUsage;
	import android.os.Binder;		import android.os.Binder;
			import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.HandlerExecutor;		import android.os.HandlerExecutor;
	@@ -343,7 +344,7 @@ public class PhoneStateListener {
	* using a particular non-null Looper.		* using a particular non-null Looper.
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public PhoneStateListener(Looper looper) {		public PhoneStateListener(Looper looper) {
	this(null, looper);		this(null, looper);
	}		}
	@@ -354,7 +355,7 @@ public class PhoneStateListener {
	* own non-null Looper use PhoneStateListener(int subId, Looper looper) below.		* own non-null Looper use PhoneStateListener(int subId, Looper looper) below.
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public PhoneStateListener(Integer subId) {		public PhoneStateListener(Integer subId) {
	this(subId, Looper.myLooper());		this(subId, Looper.myLooper());
	}		}
	@@ -364,7 +365,7 @@ public class PhoneStateListener {
	* and non-null Looper.		* and non-null Looper.
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public PhoneStateListener(Integer subId, Looper looper) {		public PhoneStateListener(Integer subId, Looper looper) {
	this(subId, new HandlerExecutor(new Handler(looper)));		this(subId, new HandlerExecutor(new Handler(looper)));
	}		}

telephony/java/android/telephony/ServiceState.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -213,7 +213,7 @@ public class ServiceState implements Parcelable {
	* IWLAN		* IWLAN
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public static final int RIL_RADIO_TECHNOLOGY_IWLAN = 18;		public static final int RIL_RADIO_TECHNOLOGY_IWLAN = 18;

	/**		/**
	@@ -595,7 +595,7 @@ public class ServiceState implements Parcelable {
	* @return roaming type		* @return roaming type
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public @RoamingType int getVoiceRoamingType() {		public @RoamingType int getVoiceRoamingType() {
	final NetworkRegistrationState regState = getNetworkRegistrationState(		final NetworkRegistrationState regState = getNetworkRegistrationState(
	NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TransportType.WWAN);		NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TransportType.WWAN);
	@@ -634,7 +634,7 @@ public class ServiceState implements Parcelable {
	* @return roaming type		* @return roaming type
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public @RoamingType int getDataRoamingType() {		public @RoamingType int getDataRoamingType() {
	final NetworkRegistrationState regState = getNetworkRegistrationState(		final NetworkRegistrationState regState = getNetworkRegistrationState(
	NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TransportType.WWAN);		NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TransportType.WWAN);
	@@ -785,7 +785,7 @@ public class ServiceState implements Parcelable {
	* @return numeric format of operator, null if unregistered or unknown		* @return numeric format of operator, null if unregistered or unknown
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public String getVoiceOperatorNumeric() {		public String getVoiceOperatorNumeric() {
	return mVoiceOperatorNumeric;		return mVoiceOperatorNumeric;
	}		}

telephony/java/android/telephony/TelephonyManager.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -7674,7 +7674,7 @@ public class TelephonyManager {
	* @see SubscriptionManager#getDefaultSubscriptionId()		* @see SubscriptionManager#getDefaultSubscriptionId()
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public boolean isImsRegistered() {		public boolean isImsRegistered() {
	try {		try {
	return getITelephony().isImsRegistered(getSubId());		return getITelephony().isImsRegistered(getSubId());
	@@ -7691,7 +7691,7 @@ public class TelephonyManager {
	* @see SubscriptionManager#getDefaultSubscriptionId()		* @see SubscriptionManager#getDefaultSubscriptionId()
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public boolean isVolteAvailable() {		public boolean isVolteAvailable() {
	try {		try {
	return getITelephony().isAvailable(getSubId(),		return getITelephony().isAvailable(getSubId(),
	@@ -7710,7 +7710,7 @@ public class TelephonyManager {
	* @return true if VT is available, or false if it is unavailable or unknown.		* @return true if VT is available, or false if it is unavailable or unknown.
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public boolean isVideoTelephonyAvailable() {		public boolean isVideoTelephonyAvailable() {
	try {		try {
	return getITelephony().isVideoTelephonyAvailable(getSubId());		return getITelephony().isVideoTelephonyAvailable(getSubId());
	@@ -7725,7 +7725,7 @@ public class TelephonyManager {
	* @return true if VoWiFi is available, or false if it is unavailable or unknown.		* @return true if VoWiFi is available, or false if it is unavailable or unknown.
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
	public boolean isWifiCallingAvailable() {		public boolean isWifiCallingAvailable() {
	try {		try {
	return getITelephony().isWifiCallingAvailable(getSubId());		return getITelephony().isWifiCallingAvailable(getSubId());