Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Telephony light grey list clean up for Q"

Browse Source 
am: 71ca860ff7

Change-Id: Ic6fb07bb8e5cb94df276b7dfb3c40cb5e2325581
This commit is contained in:
Chen Xu
2018-11-19 18:07:43 -08:00
committed by android-build-merger
parent 60e62c4e20 71ca860ff7
commit 0daf5ca480
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/PhoneStateListener.java
View File

@@ -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)));
} }

8
telephony/java/android/telephony/ServiceState.java
View File

@@ -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;
} }

8
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -7653,7 +7653,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());
@@ -7670,7 +7670,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(),
@@ -7689,7 +7689,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());
@@ -7704,7 +7704,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());