Merge "Add @UnsupportedAppUsage annotations"

2019-03-06 17:17:27 +00:00
parent 4435924104 5ac62403d4
commit 8cbc2e9ad1
13 changed files with 88 additions and 88 deletions
--- a/config/hiddenapi-greylist.txt
+++ b/config/hiddenapi-greylist.txt
@@ -1655,7 +1655,6 @@ Lcom/android/ims/ImsCall;->isMultiparty()Z
 Lcom/android/ims/ImsCall;->reject(I)V
 Lcom/android/ims/ImsCall;->terminate(I)V
 Lcom/android/ims/ImsConfigListener$Stub;-><init>()V
-Lcom/android/ims/ImsConfigListener;->onSetFeatureResponse(IIII)V
 Lcom/android/ims/ImsEcbm;->exitEmergencyCallbackMode()V
 Lcom/android/ims/ImsManager;->getConfigInterface()Lcom/android/ims/ImsConfig;
 Lcom/android/ims/ImsManager;->getInstance(Landroid/content/Context;I)Lcom/android/ims/ImsManager;
@@ -1665,104 +1664,17 @@ Lcom/android/ims/ImsManager;->isVolteEnabledByPlatform(Landroid/content/Context;
 Lcom/android/ims/ImsUtInterface;->queryCallForward(ILjava/lang/String;Landroid/os/Message;)V
 Lcom/android/ims/internal/IImsCallSession$Stub;-><init>()V
 Lcom/android/ims/internal/IImsCallSession$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/ims/internal/IImsCallSession;
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionConferenceStateUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsConferenceState;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHandover(Lcom/android/ims/internal/IImsCallSession;IILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHandoverFailed(Lcom/android/ims/internal/IImsCallSession;IILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHeld(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHoldFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHoldReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionInviteParticipantsRequestDelivered(Lcom/android/ims/internal/IImsCallSession;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionInviteParticipantsRequestFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeComplete(Lcom/android/ims/internal/IImsCallSession;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeStarted(Lcom/android/ims/internal/IImsCallSession;Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMultipartyStateChanged(Lcom/android/ims/internal/IImsCallSession;Z)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionProgressing(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsStreamMediaProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumeFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumeReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionStarted(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionStartFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionSuppServiceReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsSuppServiceNotification;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionTerminated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionTtyModeReceived(Lcom/android/ims/internal/IImsCallSession;I)V
-Lcom/android/ims/internal/IImsCallSessionListener;->callSessionUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V
 Lcom/android/ims/internal/IImsConfig$Stub;-><init>()V
 Lcom/android/ims/internal/IImsEcbm$Stub;-><init>()V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationAssociatedUriChanged([Landroid/net/Uri;)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationChangeFailed(ILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationConnected()V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationConnectedWithRadioTech(I)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationDisconnected(Landroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationFeatureCapabilityChanged(I[I[I)V
-Lcom/android/ims/internal/IImsRegistrationListener;->registrationProgressingWithRadioTech(I)V
-Lcom/android/ims/internal/IImsRegistrationListener;->voiceMessageCountUpdate(I)V
 Lcom/android/ims/internal/IImsService$Stub;-><init>()V
 Lcom/android/ims/internal/IImsService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/ims/internal/IImsService;
 Lcom/android/ims/internal/IImsUt$Stub;-><init>()V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallBarringQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsSsInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallForwardQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsCallForwardInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallWaitingQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsSsInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueried(Lcom/android/ims/internal/IImsUt;ILandroid/os/Bundle;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueryFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdated(Lcom/android/ims/internal/IImsUt;I)V
-Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdateFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V
-Lcom/android/ims/internal/IImsVideoCallCallback;->changeCallDataUsage(J)V
-Lcom/android/ims/internal/IImsVideoCallCallback;->changeCameraCapabilities(Landroid/telecom/VideoProfile$CameraCapabilities;)V
-Lcom/android/ims/internal/IImsVideoCallCallback;->changePeerDimensions(II)V
-Lcom/android/ims/internal/IImsVideoCallCallback;->changeVideoQuality(I)V
-Lcom/android/ims/internal/IImsVideoCallCallback;->handleCallSessionEvent(I)V
-Lcom/android/ims/internal/IImsVideoCallCallback;->receiveSessionModifyRequest(Landroid/telecom/VideoProfile;)V
-Lcom/android/ims/internal/IImsVideoCallCallback;->receiveSessionModifyResponse(ILandroid/telecom/VideoProfile;Landroid/telecom/VideoProfile;)V
 Lcom/android/ims/internal/IImsVideoCallProvider$Stub;-><init>()V
-Lcom/android/ims/internal/IImsVideoCallProvider;->setCallback(Lcom/android/ims/internal/IImsVideoCallCallback;)V
 Lcom/android/ims/internal/ImsVideoCallProviderWrapper;-><init>(Lcom/android/ims/internal/IImsVideoCallProvider;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->cmdStatus(Lcom/android/ims/internal/uce/options/OptionsCmdStatus;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->getVersionCb(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->incomingOptions(Ljava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;I)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->serviceAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->serviceUnavailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/options/IOptionsListener;->sipResponseReceived(Ljava/lang/String;Lcom/android/ims/internal/uce/options/OptionsSipResponse;Lcom/android/ims/internal/uce/options/OptionsCapInfo;)V
 Lcom/android/ims/internal/uce/options/IOptionsService$Stub;-><init>()V
-Lcom/android/ims/internal/uce/options/IOptionsService;->addListener(ILcom/android/ims/internal/uce/options/IOptionsListener;Lcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getContactCap(ILjava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getContactListCap(I[Ljava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getMyInfo(II)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->getVersion(I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->responseIncomingOptions(IIILjava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;Z)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/options/IOptionsService;->setMyInfo(ILcom/android/ims/internal/uce/common/CapInfo;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->capInfoReceived(Ljava/lang/String;[Lcom/android/ims/internal/uce/presence/PresTupleInfo;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->cmdStatus(Lcom/android/ims/internal/uce/presence/PresCmdStatus;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->getVersionCb(Ljava/lang/String;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->listCapInfoReceived(Lcom/android/ims/internal/uce/presence/PresRlmiInfo;[Lcom/android/ims/internal/uce/presence/PresResInfo;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->publishTriggering(Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->serviceAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->serviceUnAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->sipResponseReceived(Lcom/android/ims/internal/uce/presence/PresSipResponse;)V
-Lcom/android/ims/internal/uce/presence/IPresenceListener;->unpublishMessageSent()V
 Lcom/android/ims/internal/uce/presence/IPresenceService$Stub;-><init>()V
-Lcom/android/ims/internal/uce/presence/IPresenceService;->addListener(ILcom/android/ims/internal/uce/presence/IPresenceListener;Lcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->getContactCap(ILjava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->getContactListCap(I[Ljava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->getVersion(I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->publishMyCap(ILcom/android/ims/internal/uce/presence/PresCapInfo;I)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->reenableService(II)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode;
-Lcom/android/ims/internal/uce/presence/IPresenceService;->setNewFeatureTag(ILjava/lang/String;Lcom/android/ims/internal/uce/presence/PresServiceInfo;I)Lcom/android/ims/internal/uce/common/StatusCode;
 Lcom/android/ims/internal/uce/uceservice/IUceListener$Stub;-><init>()V
-Lcom/android/ims/internal/uce/uceservice/IUceListener;->setStatus(I)V
 Lcom/android/ims/internal/uce/uceservice/IUceService$Stub;-><init>()V
-Lcom/android/ims/internal/uce/uceservice/IUceService;->createOptionsService(Lcom/android/ims/internal/uce/options/IOptionsListener;Lcom/android/ims/internal/uce/common/UceLong;)I
-Lcom/android/ims/internal/uce/uceservice/IUceService;->createPresenceService(Lcom/android/ims/internal/uce/presence/IPresenceListener;Lcom/android/ims/internal/uce/common/UceLong;)I
-Lcom/android/ims/internal/uce/uceservice/IUceService;->destroyOptionsService(I)V
-Lcom/android/ims/internal/uce/uceservice/IUceService;->destroyPresenceService(I)V
-Lcom/android/ims/internal/uce/uceservice/IUceService;->getOptionsService()Lcom/android/ims/internal/uce/options/IOptionsService;
-Lcom/android/ims/internal/uce/uceservice/IUceService;->getPresenceService()Lcom/android/ims/internal/uce/presence/IPresenceService;
-Lcom/android/ims/internal/uce/uceservice/IUceService;->getServiceStatus()Z
-Lcom/android/ims/internal/uce/uceservice/IUceService;->isServiceStarted()Z
-Lcom/android/ims/internal/uce/uceservice/IUceService;->startService(Lcom/android/ims/internal/uce/uceservice/IUceListener;)Z
-Lcom/android/ims/internal/uce/uceservice/IUceService;->stopService()Z
 Lcom/android/internal/app/AlertActivity;-><init>()V
 Lcom/android/internal/app/AlertActivity;->mAlert:Lcom/android/internal/app/AlertController;
 Lcom/android/internal/app/AlertActivity;->mAlertParams:Lcom/android/internal/app/AlertController$AlertParams;
--- a/telephony/java/com/android/ims/ImsConfigListener.aidl
+++ b/telephony/java/com/android/ims/ImsConfigListener.aidl
@@ -47,6 +47,7 @@ oneway interface ImsConfigListener {
     *
     * @return void.
     */
+    @UnsupportedAppUsage
    void onSetFeatureResponse(int feature, int network, int value, int status);

    /**
--- a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
+++ b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
@@ -34,33 +34,47 @@ oneway interface IImsCallSessionListener {
    /**
     * Notifies the result of the basic session operation (setup / terminate).
     */
+    @UnsupportedAppUsage
    void callSessionProgressing(in IImsCallSession session, in ImsStreamMediaProfile profile);
+    @UnsupportedAppUsage
    void callSessionStarted(in IImsCallSession session, in ImsCallProfile profile);
+    @UnsupportedAppUsage
    void callSessionStartFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo);
+    @UnsupportedAppUsage
    void callSessionTerminated(in IImsCallSession session, in ImsReasonInfo reasonInfo);

    /**
     * Notifies the result of the call hold/resume operation.
     */
+    @UnsupportedAppUsage
    void callSessionHeld(in IImsCallSession session, in ImsCallProfile profile);
+    @UnsupportedAppUsage
    void callSessionHoldFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo);
+    @UnsupportedAppUsage
    void callSessionHoldReceived(in IImsCallSession session, in ImsCallProfile profile);
+    @UnsupportedAppUsage
    void callSessionResumed(in IImsCallSession session, in ImsCallProfile profile);
+    @UnsupportedAppUsage
    void callSessionResumeFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo);
+    @UnsupportedAppUsage
    void callSessionResumeReceived(in IImsCallSession session, in ImsCallProfile profile);

    /**
     * Notifies the result of call merge operation.
     */
+    @UnsupportedAppUsage
    void callSessionMergeStarted(in IImsCallSession session,
            in IImsCallSession newSession, in ImsCallProfile profile);
+    @UnsupportedAppUsage
    void callSessionMergeComplete(in IImsCallSession session);
+    @UnsupportedAppUsage
    void callSessionMergeFailed(in IImsCallSession session,
            in ImsReasonInfo reasonInfo);

    /**
     * Notifies the result of call upgrade / downgrade or any other call updates.
     */
+    @UnsupportedAppUsage
    void callSessionUpdated(in IImsCallSession session,
            in ImsCallProfile profile);
    void callSessionUpdateFailed(in IImsCallSession session,
@@ -81,7 +95,9 @@ oneway interface IImsCallSessionListener {
    /**
     * Notifies the result of the participant invitation / removal to/from the conference session.
     */
+    @UnsupportedAppUsage
    void callSessionInviteParticipantsRequestDelivered(in IImsCallSession session);
+    @UnsupportedAppUsage
    void callSessionInviteParticipantsRequestFailed(in IImsCallSession session,
            in ImsReasonInfo reasonInfo);
    void callSessionRemoveParticipantsRequestDelivered(in IImsCallSession session);
@@ -91,6 +107,7 @@ oneway interface IImsCallSessionListener {
    /**
     * Notifies the changes of the conference info. in the conference session.
     */
+    @UnsupportedAppUsage
    void callSessionConferenceStateUpdated(in IImsCallSession session,
            in ImsConferenceState state);

@@ -103,8 +120,10 @@ oneway interface IImsCallSessionListener {
    /**
     * Notifies of handover information for this call
     */
+    @UnsupportedAppUsage
    void callSessionHandover(in IImsCallSession session,
            in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo);
+    @UnsupportedAppUsage
    void callSessionHandoverFailed(in IImsCallSession session,
            in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo);
    void callSessionMayHandover(in IImsCallSession session,
@@ -118,6 +137,7 @@ oneway interface IImsCallSessionListener {
     * - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO}
     * - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO}
     */
+    @UnsupportedAppUsage
    void callSessionTtyModeReceived(in IImsCallSession session, in int mode);

    /**
@@ -126,11 +146,13 @@ oneway interface IImsCallSessionListener {
     * @param session The call session.
     * @param isMultiParty {@code true} if the session became multiparty, {@code false} otherwise.
     */
+    @UnsupportedAppUsage
    void callSessionMultipartyStateChanged(in IImsCallSession session, in boolean isMultiParty);

    /**
     * Notifies the supplementary service information for the current session.
     */
+    @UnsupportedAppUsage
    void callSessionSuppServiceReceived(in IImsCallSession session,
         in ImsSuppServiceNotification suppSrvNotification);

--- a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
+++ b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
@@ -32,6 +32,7 @@ oneway interface IImsRegistrationListener {
     *
     * @deprecated see {@link registrationConnectedWithRadioTech}
     */
+    @UnsupportedAppUsage
    void registrationConnected();

    /**
@@ -47,6 +48,7 @@ oneway interface IImsRegistrationListener {
     * @param imsRadioTech the radio access technology. Valid values are {@code
     * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}.
     */
+    @UnsupportedAppUsage
    void registrationConnectedWithRadioTech(int imsRadioTech);

    /**
@@ -55,12 +57,14 @@ oneway interface IImsRegistrationListener {
     * @param imsRadioTech the radio access technology. Valid values are {@code
     * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}.
     */
+    @UnsupportedAppUsage
    void registrationProgressingWithRadioTech(int imsRadioTech);


    /**
     * Notifies the application when the device is disconnected from the IMS network.
     */
+    @UnsupportedAppUsage
    void registrationDisconnected(in ImsReasonInfo imsReasonInfo);

    /**
@@ -94,6 +98,7 @@ oneway interface IImsRegistrationListener {
     * @param enabledFeatures features enabled as defined in com.android.ims.ImsConfig#FeatureConstants.
     * @param disabledFeatures features disabled as defined in com.android.ims.ImsConfig#FeatureConstants.
     */
+    @UnsupportedAppUsage
    void registrationFeatureCapabilityChanged(int serviceClass,
            in int[] enabledFeatures, in int[] disabledFeatures);

@@ -101,11 +106,13 @@ oneway interface IImsRegistrationListener {
     * Updates the application with the waiting voice message count.
     * @param count The number of waiting voice messages.
     */
+    @UnsupportedAppUsage
    void voiceMessageCountUpdate(int count);

    /**
     * Notifies the application when the list of URIs associated with IMS client is updated.
     */
+    @UnsupportedAppUsage
    void registrationAssociatedUriChanged(in Uri[] uris);

    /**
@@ -116,5 +123,6 @@ oneway interface IImsRegistrationListener {
     *         attempted.
     * @param imsReasonInfo Reason for the failure.
     */
+    @UnsupportedAppUsage
    void registrationChangeFailed(in int targetAccessTech, in ImsReasonInfo imsReasonInfo);
 }
--- a/telephony/java/com/android/ims/internal/IImsUtListener.aidl
+++ b/telephony/java/com/android/ims/internal/IImsUtListener.aidl
@@ -31,30 +31,37 @@ oneway interface IImsUtListener {
    /**
     * Notifies the result of the supplementary service configuration udpate.
     */
+    @UnsupportedAppUsage
    void utConfigurationUpdated(in IImsUt ut, int id);
+    @UnsupportedAppUsage
    void utConfigurationUpdateFailed(in IImsUt ut, int id, in ImsReasonInfo error);

    /**
     * Notifies the result of the supplementary service configuration query.
     */
+    @UnsupportedAppUsage
    void utConfigurationQueried(in IImsUt ut, int id, in Bundle ssInfo);
+    @UnsupportedAppUsage
    void utConfigurationQueryFailed(in IImsUt ut, int id, in ImsReasonInfo error);

    /**
     * Notifies the status of the call barring supplementary service.
     */
+    @UnsupportedAppUsage
    void utConfigurationCallBarringQueried(in IImsUt ut,
            int id, in ImsSsInfo[] cbInfo);

    /**
     * Notifies the status of the call forwarding supplementary service.
     */
+    @UnsupportedAppUsage
    void utConfigurationCallForwardQueried(in IImsUt ut,
            int id, in ImsCallForwardInfo[] cfInfo);

    /**
     * Notifies the status of the call waiting supplementary service.
     */
+    @UnsupportedAppUsage
    void utConfigurationCallWaitingQueried(in IImsUt ut,
            int id, in ImsSsInfo[] cwInfo);

--- a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl
+++ b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl
@@ -31,18 +31,25 @@ import android.telecom.VideoProfile;
 * {@hide}
 */
 oneway interface IImsVideoCallCallback {
+    @UnsupportedAppUsage
    void receiveSessionModifyRequest(in VideoProfile videoProfile);

+    @UnsupportedAppUsage
    void receiveSessionModifyResponse(int status, in VideoProfile requestedProfile,
        in VideoProfile responseProfile);

+    @UnsupportedAppUsage
    void handleCallSessionEvent(int event);

+    @UnsupportedAppUsage
    void changePeerDimensions(int width, int height);

+    @UnsupportedAppUsage
    void changeCallDataUsage(long dataUsage);

+    @UnsupportedAppUsage
    void changeCameraCapabilities(in VideoProfile.CameraCapabilities cameraCapabilities);

+    @UnsupportedAppUsage
    void changeVideoQuality(int videoQuality);
 }
--- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
+++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
@@ -41,6 +41,7 @@ import com.android.ims.internal.IImsVideoCallCallback;
 * @hide
 */
 oneway interface IImsVideoCallProvider {
+    @UnsupportedAppUsage
    void setCallback(IImsVideoCallCallback callback);

    void setCamera(String cameraId, int uid);
--- a/telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl
+++ b/telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl
@@ -29,6 +29,7 @@ interface IOptionsListener
     * @param version, version information of the service.
     * @hide
     */
+    @UnsupportedAppUsage
    void getVersionCb(in String version );

    /**
@@ -37,6 +38,7 @@ interface IOptionsListener
     * @param statusCode, UCE_SUCCESS as service availability.
     * @hide
     */
+    @UnsupportedAppUsage
    void serviceAvailable(in StatusCode statusCode);

    /**
@@ -45,6 +47,7 @@ interface IOptionsListener
     * @param statusCode, UCE_SUCCESS as service unavailability.
     * @hide
     */
+    @UnsupportedAppUsage
    void serviceUnavailable(in StatusCode statusCode);

    /**
@@ -55,6 +58,7 @@ interface IOptionsListener
     * @param capInfo, capabilities of the remote entity received.
     * @hide
     */
+    @UnsupportedAppUsage
    void sipResponseReceived( String uri,
                                in OptionsSipResponse sipResponse, in OptionsCapInfo capInfo);

@@ -63,6 +67,7 @@ interface IOptionsListener
     * @param cmdStatus, command status of the request placed.
     * @hide
     */
+    @UnsupportedAppUsage
    void cmdStatus(in OptionsCmdStatus cmdStatus);

    /**
@@ -73,6 +78,7 @@ interface IOptionsListener
     * @param tID, transation of the request received from network.
     * @hide
     */
+    @UnsupportedAppUsage
    void incomingOptions( String uri, in OptionsCapInfo capInfo,
                                            in int tID);
 }
--- a/telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl
+++ b/telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl
@@ -33,6 +33,7 @@ interface IOptionsService
     * @return StatusCode, status of the request placed.
     * @hide
     */
+    @UnsupportedAppUsage
    StatusCode getVersion(int optionsServiceHandle);

    /**
@@ -44,6 +45,7 @@ interface IOptionsService
     * The service will fill UceLong.mUceLong with optionsServiceListenerHdl
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode addListener(int optionsServiceHandle, IOptionsListener optionsListener,
                           inout UceLong optionsServiceListenerHdl);

@@ -54,6 +56,7 @@ interface IOptionsService
     * @param optionsServiceListenerHdl provided in createOptionsService() or Addlistener().
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode removeListener(int optionsServiceHandle, in UceLong optionsServiceListenerHdl);

    /**
@@ -66,6 +69,7 @@ interface IOptionsService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode setMyInfo(int optionsServiceHandle , in CapInfo capInfo, int reqUserData);


@@ -78,6 +82,7 @@ interface IOptionsService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode getMyInfo(int optionsServiceHandle , int reqUserdata);

    /**
@@ -90,6 +95,7 @@ interface IOptionsService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode getContactCap(int optionsServiceHandle , String remoteURI, int reqUserData);


@@ -103,6 +109,7 @@ interface IOptionsService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode getContactListCap(int optionsServiceHandle, in String[] remoteURIList,
                                 int reqUserData);

@@ -119,6 +126,7 @@ interface IOptionsService
     * @param bContactInBL, true if the contact is blacklisted, else false.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode responseIncomingOptions(int optionsServiceHandle,  int tId, int sipResponseCode,
                                       String reasonPhrase, in OptionsCapInfo capInfo,
                                       in boolean bContactInBL);
--- a/telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl
+++ b/telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl
@@ -36,6 +36,7 @@ interface IPresenceListener
     * Gets the version of the presence listener implementation.
     * @param version, version information.
     */
+    @UnsupportedAppUsage
    void getVersionCb(in String version );

    /**
@@ -43,6 +44,7 @@ interface IPresenceListener
     * availability.
     * @param statusCode, UCE_SUCCESS as service availability.
     */
+    @UnsupportedAppUsage
    void serviceAvailable(in StatusCode statusCode);

    /**
@@ -50,6 +52,7 @@ interface IPresenceListener
     * unavailability.
     * @param statusCode, UCE_SUCCESS as service unAvailability.
     */
+    @UnsupportedAppUsage
    void serviceUnAvailable(in StatusCode statusCode);

    /**
@@ -57,12 +60,14 @@ interface IPresenceListener
     * publish request.
     * @param publishTrigger, Publish trigger for the network being supported.
     */
+    @UnsupportedAppUsage
    void publishTriggering(in PresPublishTriggerType publishTrigger);

    /**
     * Callback function to be invoked to inform the client of the status of an asynchronous call.
     * @param cmdStatus, command status of the request placed.
     */
+    @UnsupportedAppUsage
    void cmdStatus( in PresCmdStatus cmdStatus);

    /**
@@ -70,6 +75,7 @@ interface IPresenceListener
     * such as PUBLISH or SUBSCRIBE, has been received.
     * @param sipResponse, network response received for the request placed.
     */
+    @UnsupportedAppUsage
    void sipResponseReceived(in PresSipResponse sipResponse);

    /**
@@ -78,6 +84,7 @@ interface IPresenceListener
     * @param presentityURI, URI of the remote entity the request was placed.
     * @param tupleInfo, array of capability information remote entity supports.
     */
+    @UnsupportedAppUsage
    void capInfoReceived(in String presentityURI,
                         in PresTupleInfo [] tupleInfo);

@@ -87,6 +94,7 @@ interface IPresenceListener
     * @param rlmiInfo, resource infomation received from network.
     * @param resInfo, array of capabilities received from network for the list of  remore URI.
     */
+    @UnsupportedAppUsage
    void listCapInfoReceived(in PresRlmiInfo rlmiInfo,
                             in PresResInfo [] resInfo);

@@ -94,6 +102,7 @@ interface IPresenceListener
     * Callback function to be invoked to inform the client when Unpublish message
     * is sent to network.
     */
+    @UnsupportedAppUsage
    void unpublishMessageSent();

 }
--- a/telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl
+++ b/telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl
@@ -33,6 +33,7 @@ interface IPresenceService
     * @param presenceServiceHdl returned in createPresenceService().
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode getVersion(int presenceServiceHdl);

    /**
@@ -45,6 +46,7 @@ interface IPresenceService
     *
     * @return StatusCode, status of the request placed
     */
+    @UnsupportedAppUsage
    StatusCode addListener(int presenceServiceHdl, IPresenceListener presenceServiceListener,
                           inout UceLong presenceServiceListenerHdl);

@@ -54,6 +56,7 @@ interface IPresenceService
     * @param presenceServiceListenerHdl provided in createPresenceService() or Addlistener().
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode removeListener(int presenceServiceHdl, in UceLong presenceServiceListenerHdl);

    /**
@@ -69,6 +72,7 @@ interface IPresenceService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode reenableService(int presenceServiceHdl, int userData);

    /**
@@ -81,6 +85,7 @@ interface IPresenceService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode publishMyCap(int presenceServiceHdl, in PresCapInfo myCapInfo , int userData);

    /**
@@ -94,6 +99,7 @@ interface IPresenceService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode getContactCap(int presenceServiceHdl , String remoteUri, int userData);

    /**
@@ -107,6 +113,7 @@ interface IPresenceService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode getContactListCap(int presenceServiceHdl, in String[] remoteUriList, int userData);

    /**
@@ -122,6 +129,7 @@ interface IPresenceService
     *                  with original request.
     * @return StatusCode, status of the request placed.
     */
+    @UnsupportedAppUsage
    StatusCode  setNewFeatureTag(int presenceServiceHdl, String featureTag,
                                 in PresServiceInfo serviceInfo, int userData);

--- a/telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl
+++ b/telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl
@@ -25,5 +25,6 @@ interface IUceListener
     * @param serviceStatusValue defined in ImsUceManager
     * @hide
     */
+    @UnsupportedAppUsage
    void setStatus(int serviceStatusValue);
 }
--- a/telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl
+++ b/telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl
@@ -38,6 +38,7 @@ interface IUceService
     * Service status is returned in setStatus callback in IUceListener.
     * @hide
     */
+    @UnsupportedAppUsage
    boolean startService(IUceListener uceListener);

    /**
@@ -45,6 +46,7 @@ interface IUceService
     * @return boolean true if the service stop request is processed successfully, FALSE otherwise.
     * @hide
     */
+    @UnsupportedAppUsage
    boolean stopService();


@@ -54,6 +56,7 @@ interface IUceService
     * @return boolean true if service started else false.
     * @hide
     */
+    @UnsupportedAppUsage
    boolean isServiceStarted();

    /**
@@ -71,6 +74,7 @@ interface IUceService
     *
     * @deprecated This is replaced with new API createOptionsServiceForSubscription()
     */
+    @UnsupportedAppUsage
    int createOptionsService(IOptionsListener optionsListener,
                             inout UceLong optionsServiceListenerHdl);
    /**
@@ -97,6 +101,7 @@ interface IUceService
     *        in IOptionsListener
     * @hide
     */
+    @UnsupportedAppUsage
    void destroyOptionsService(int optionsServiceHandle);

    /**
@@ -114,6 +119,7 @@ interface IUceService
     *
     * @deprecated This is replaced with new API createPresenceServiceForSubscription()
     */
+    @UnsupportedAppUsage
    int createPresenceService(IPresenceListener presenceServiceListener,
                              inout UceLong presenceServiceListenerHdl);
    /**
@@ -141,6 +147,7 @@ interface IUceService
     *
     * @hide
     */
+    @UnsupportedAppUsage
    void destroyPresenceService(int presenceServiceHdl);


@@ -152,6 +159,7 @@ interface IUceService
     *
     * @hide
     */
+    @UnsupportedAppUsage
    boolean getServiceStatus();

    /**
@@ -163,6 +171,7 @@ interface IUceService
     *
     * @deprecated use API getPresenceServiceForSubscription()
     */
+    @UnsupportedAppUsage
    IPresenceService getPresenceService();

    /**
@@ -185,6 +194,7 @@ interface IUceService
     *
     * @hide
     */
+    @UnsupportedAppUsage
    IOptionsService getOptionsService();

    /**