diff options
author | Artur Satayev <satayev@google.com> | 2019-11-04 19:54:26 +0000 |
---|---|---|
committer | Artur Satayev <satayev@google.com> | 2019-11-05 16:17:58 +0000 |
commit | 5cc59dd52a9dc7cd9fcec38766fff991966e5fc5 (patch) | |
tree | 8cb970e844234473e5b678210895981325b9eea9 | |
parent | ca316456d755d63b157c8e5f335ec0a7367d2c24 (diff) | |
download | ims-5cc59dd52a9dc7cd9fcec38766fff991966e5fc5.tar.gz |
Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt
These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.
Bug: 137350495
Test: m
Change-Id: I2083badb4b97d4351d8477c8c679a727f2199c16
-rw-r--r-- | src/java/com/android/ims/ImsCall.java | 26 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsEcbm.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 28 | ||||
-rw-r--r-- | src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java | 2 |
4 files changed, 36 insertions, 22 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 735ae817..83e710d7 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -16,12 +16,7 @@ package com.android.ims; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.Uri; import android.os.Bundle; @@ -30,13 +25,11 @@ import android.os.Parcel; import android.telecom.Call; import android.telecom.ConferenceParticipant; import android.telecom.Connection; -import android.telephony.Rlog; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicInteger; - import android.telephony.CallQuality; +import android.telephony.Rlog; import android.telephony.ServiceState; import android.telephony.ims.ImsCallProfile; +import android.telephony.ims.ImsCallSession; import android.telephony.ims.ImsConferenceState; import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.ImsStreamMediaProfile; @@ -44,10 +37,17 @@ import android.telephony.ims.ImsSuppServiceNotification; import android.util.Log; import com.android.ims.internal.ICall; -import android.telephony.ims.ImsCallSession; import com.android.ims.internal.ImsStreamMediaSession; import com.android.internal.annotations.VisibleForTesting; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; + /** * Handles an IMS voice / video call over LTE. You can instantiate this class with * {@link ImsManager}. @@ -937,6 +937,7 @@ public class ImsCall implements ICall { * * @return {@code True} if the call is a multiparty call. */ + @UnsupportedAppUsage public boolean isMultiparty() { synchronized(mLockObj) { if (mSession == null) { @@ -1200,6 +1201,7 @@ public class ImsCall implements ICall { * @param number number to be deflected to. * @throws ImsException if the IMS service fails to deflect the call */ + @UnsupportedAppUsage public void deflect(String number) throws ImsException { logi("deflect :: session=" + mSession + ", number=" + Rlog.pii(TAG, number)); @@ -1225,6 +1227,7 @@ public class ImsCall implements ICall { * @see Listener#onCallStartFailed * @throws ImsException if the IMS service fails to reject the call */ + @UnsupportedAppUsage public void reject(int reason) throws ImsException { logi("reject :: reason=" + reason); @@ -1259,6 +1262,7 @@ public class ImsCall implements ICall { * * @param reason reason code to terminate a call */ + @UnsupportedAppUsage public void terminate(int reason) { logi("terminate :: reason=" + reason); diff --git a/src/java/com/android/ims/ImsEcbm.java b/src/java/com/android/ims/ImsEcbm.java index 99d99f17..0abfebe7 100644 --- a/src/java/com/android/ims/ImsEcbm.java +++ b/src/java/com/android/ims/ImsEcbm.java @@ -29,6 +29,7 @@ package com.android.ims; +import android.annotation.UnsupportedAppUsage; import android.os.RemoteException; import android.telephony.Rlog; import android.telephony.ims.ImsReasonInfo; @@ -63,6 +64,7 @@ public class ImsEcbm { } } + @UnsupportedAppUsage public void exitEmergencyCallbackMode() throws ImsException { try { miEcbm.exitEmergencyCallbackMode(); diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 0a8b7c2e..9ac3f076 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -17,6 +17,7 @@ package com.android.ims; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.app.PendingIntent; import android.content.Context; import android.content.pm.PackageManager; @@ -33,32 +34,32 @@ import android.provider.Settings; import android.telecom.TelecomManager; import android.telephony.AccessNetworkConstants; import android.telephony.CarrierConfigManager; -import android.telephony.ims.RegistrationManager; -import android.telephony.ims.ImsMmTelManager; -import android.telephony.ims.ImsService; -import android.telephony.ims.ProvisioningManager; -import android.telephony.ims.aidl.IImsCapabilityCallback; -import android.telephony.ims.aidl.IImsConfigCallback; -import android.telephony.ims.aidl.IImsRegistrationCallback; -import android.telephony.ims.stub.ImsCallSessionImplBase; -import android.telephony.ims.stub.ImsConfigImplBase; -import android.telephony.ims.stub.ImsRegistrationImplBase; import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.ims.ImsCallProfile; +import android.telephony.ims.ImsCallSession; +import android.telephony.ims.ImsMmTelManager; import android.telephony.ims.ImsReasonInfo; +import android.telephony.ims.ImsService; +import android.telephony.ims.ProvisioningManager; +import android.telephony.ims.RegistrationManager; +import android.telephony.ims.aidl.IImsCapabilityCallback; import android.telephony.ims.aidl.IImsConfig; +import android.telephony.ims.aidl.IImsConfigCallback; +import android.telephony.ims.aidl.IImsRegistrationCallback; import android.telephony.ims.aidl.IImsSmsListener; import android.telephony.ims.feature.CapabilityChangeRequest; import android.telephony.ims.feature.ImsFeature; import android.telephony.ims.feature.MmTelFeature; +import android.telephony.ims.stub.ImsCallSessionImplBase; +import android.telephony.ims.stub.ImsConfigImplBase; +import android.telephony.ims.stub.ImsRegistrationImplBase; import com.android.ims.internal.IImsCallSession; import com.android.ims.internal.IImsEcbm; import com.android.ims.internal.IImsMultiEndpoint; import com.android.ims.internal.IImsUt; -import android.telephony.ims.ImsCallSession; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.ITelephony; @@ -259,6 +260,7 @@ public class ImsManager implements IFeatureConnector { * @param phoneId the phone ID for the IMS Service * @return the manager instance corresponding to the phoneId */ + @UnsupportedAppUsage public static ImsManager getInstance(Context context, int phoneId) { synchronized (sImsManagerInstances) { if (sImsManagerInstances.containsKey(phoneId)) { @@ -287,6 +289,7 @@ public class ImsManager implements IFeatureConnector { * @deprecated Doesn't support MSIM devices. Use * {@link #isEnhanced4gLteModeSettingEnabledByUser()} instead. */ + @UnsupportedAppUsage public static boolean isEnhanced4gLteModeSettingEnabledByUser(Context context) { ImsManager mgr = ImsManager.getInstance(context, SubscriptionManager.getDefaultVoicePhoneId()); @@ -392,6 +395,7 @@ public class ImsManager implements IFeatureConnector { * @deprecated Does not support MSIM devices. Please use * {@link #isNonTtyOrTtyOnVolteEnabled()} instead. */ + @UnsupportedAppUsage public static boolean isNonTtyOrTtyOnVolteEnabled(Context context) { ImsManager mgr = ImsManager.getInstance(context, SubscriptionManager.getDefaultVoicePhoneId()); @@ -428,6 +432,7 @@ public class ImsManager implements IFeatureConnector { * @deprecated Does not support MSIM devices. Please use * {@link #isVolteEnabledByPlatform()} instead. */ + @UnsupportedAppUsage public static boolean isVolteEnabledByPlatform(Context context) { ImsManager mgr = ImsManager.getInstance(context, SubscriptionManager.getDefaultVoicePhoneId()); @@ -1970,6 +1975,7 @@ public class ImsManager implements IFeatureConnector { * @return the ImsConfig instance. * @throws ImsException if getting the setting interface results in an error. */ + @UnsupportedAppUsage public ImsConfig getConfigInterface() throws ImsException { checkAndThrowExceptionIfServiceUnavailable(); diff --git a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java index a77000db..05daa35b 100644 --- a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java +++ b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java @@ -16,6 +16,7 @@ package com.android.ims.internal; +import android.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Binder; import android.os.Handler; @@ -227,6 +228,7 @@ public class ImsVideoCallProviderWrapper extends Connection.VideoProvider { * * @param VideoProvider */ + @UnsupportedAppUsage public ImsVideoCallProviderWrapper(IImsVideoCallProvider videoProvider) throws RemoteException { |