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

Commit d31cf193 authored by Shashank Kumar's avatar Shashank Kumar
Browse files

(SmsStack) Change memory available notification API from hidden to SystemApi 

Bug: 432379626
Doc: go/smma-system-api
Test: Manual MO/MT SMS
Test: atest ImsStackJavaTests ImsServiceTest
Flag: NONE pre-production
Change-Id: I3fe9c323b6b60fdb6cefc89734c1cb17e8217e28
parent d917e7b4

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -18693,6 +18693,8 @@ package android.telephony.ims.stub { 
    method public void acknowledgeSms(int, @IntRange(from=0, to=65535) int, int, @NonNull byte[]);

    method public void acknowledgeSmsReport(int, @IntRange(from=0, to=65535) int, int);

    method public String getSmsFormat();

    method @FlaggedApi("com.android.internal.telephony.flags.support_ims_sms_smma") public void onMemoryAvailable(int);

    method @FlaggedApi("com.android.internal.telephony.flags.support_ims_sms_smma") public final void onMemoryAvailableResult(int, int, int) throws java.lang.RuntimeException;

    method public void onReady();

    method @Deprecated public final void onSendSmsResult(int, @IntRange(from=0, to=65535) int, int, int) throws java.lang.RuntimeException;

    method public final void onSendSmsResultError(int, @IntRange(from=0, to=65535) int, int, int, int) throws java.lang.RuntimeException;

telephony/java/android/telephony/ims/stub/ImsSmsImplBase.java

+8 −7
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.telephony.ims.stub;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -26,6 +27,8 @@ import android.telephony.SmsMessage; 
import android.telephony.ims.aidl.IImsSmsListener;

import android.util.Log;



import com.android.internal.telephony.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.concurrent.Executor;
@@ -194,11 +197,10 @@ public class ImsSmsImplBase { 
     * TS 124.11. Once the RP-SMMA Notification is sent to the network. The network will deliver all

     * the pending messages which failed due to Unavailability of Memory.

     *

     * @param token unique token generated in {@link ImsSmsDispatcher#onMemoryAvailable(void)} that

     *  should be used when triggering callbacks for this specific message.

     *

     * @hide

     * @param token unique token generated that should be used when triggering callbacks for this

     * specific message.

     */

    @FlaggedApi(Flags.FLAG_SUPPORT_IMS_SMS_SMMA)

    public void onMemoryAvailable(int token) {

        // Base Implementation - Should be overridden

    }
@@ -406,7 +408,7 @@ public class ImsSmsImplBase { 


    /**

     * This API is used to report the result of sending

     * RP-SMMA to framework based on received network responses(RP-ACK,

     * RP-SMMA from framework based on received network responses(RP-ACK,

     * RP-ERROR or SIP error).

     *

     * @param token provided in {@link #onMemoryAvailable()}.
@@ -416,9 +418,8 @@ public class ImsSmsImplBase { 
     * {@link #RESULT_NO_NETWORK_ERROR} if no network error was generated. See

     * 3GPP TS 24.011 Section 7.3.4 for valid error codes and more

     * information.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_SUPPORT_IMS_SMS_SMMA)

    public final void onMemoryAvailableResult(int token, @SendStatusResult int result,

            int networkErrorCode) throws RuntimeException {

        IImsSmsListener listener = null;