Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fe60af1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "API Review: Clarify deprecated docs and rethrow from system server"... 

Merge "API Review: Clarify deprecated docs and rethrow from system server" into rvc-dev am: 410b854a am: a904ec04 am: 845eef05

Change-Id: Idac62e4c6b92051dd6b9dbf528c7e592346c1bd6
parents 4ed32165 845eef05

telephony/java/android/telephony/ims/ImsUtListener.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,8 @@ public class ImsUtListener { 
     * {@link ImsSsInfo#CLIR_STATUS_TEMPORARILY_RESTRICTED}, and

     * {@link ImsSsInfo#CLIR_STATUS_TEMPORARILY_RESTRICTED}, and

     * {@link ImsSsInfo#CLIR_STATUS_TEMPORARILY_ALLOWED}.

     * {@link ImsSsInfo#CLIR_STATUS_TEMPORARILY_ALLOWED}.

     * @deprecated Use {@link #onLineIdentificationSupplementaryServiceResponse(int, ImsSsInfo)}

     * @deprecated Use {@link #onLineIdentificationSupplementaryServiceResponse(int, ImsSsInfo)}

     * instead.

     * instead, this key has been added for backwards compatibility with older proprietary

     * implementations only and is being phased out.

     */

     */

    @Deprecated

    @Deprecated

    public static final String BUNDLE_KEY_CLIR = "queryClir";

    public static final String BUNDLE_KEY_CLIR = "queryClir";
@@ -60,7 +61,8 @@ public class ImsUtListener { 
     * response. The value will be an instance of {@link ImsSsInfo}, which contains the response to

     * response. The value will be an instance of {@link ImsSsInfo}, which contains the response to

     * the query.

     * the query.

     * @deprecated Use {@link #onLineIdentificationSupplementaryServiceResponse(int, ImsSsInfo)}

     * @deprecated Use {@link #onLineIdentificationSupplementaryServiceResponse(int, ImsSsInfo)}

     * instead.

     * instead, this key has been added for backwards compatibility with older proprietary

     * implementations only and is being phased out.

     */

     */

    @Deprecated

    @Deprecated

    public static final String BUNDLE_KEY_SSINFO = "imsSsInfo";

    public static final String BUNDLE_KEY_SSINFO = "imsSsInfo";
@@ -123,7 +125,7 @@ public class ImsUtListener { 
        try {

        try {

            mServiceInterface.lineIdentificationSupplementaryServiceResponse(id, configuration);

            mServiceInterface.lineIdentificationSupplementaryServiceResponse(id, configuration);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            Log.w(LOG_TAG, "onLineIdentificationSupplementaryServicesResponse: remote exception");

            e.rethrowFromSystemServer();

        }

        }

    }

    }