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

Commit 6ed78c36 authored by Megha Patil's avatar Megha Patil Committed by Android (Google) Code Review
Browse files

Merge changes from topic "RPSMMA-Implementation-master"

* changes:
  Send Sms Memory Availability notification to ImsService
  Adding Test API to send Memory Status Event For CTS
  Add SMMA Feature to device overlay config
parents 2e00513c 7c7ede79
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -15933,6 +15933,7 @@ 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 public void onMemoryAvailable(int);
    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;
+2 −0
Original line number Diff line number Diff line
@@ -2638,6 +2638,8 @@ package android.telephony {

  public final class SmsManager {
    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int checkSmsShortCodeDestination(String, String);
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void clearStorageMonitorMemoryStatusOverride();
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setStorageMonitorMemoryStatusOverride(boolean);
    field public static final int SMS_CATEGORY_FREE_SHORT_CODE = 1; // 0x1
    field public static final int SMS_CATEGORY_NOT_SHORT_CODE = 0; // 0x0
    field public static final int SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE = 3; // 0x3
+5 −0
Original line number Diff line number Diff line
@@ -3422,6 +3422,11 @@
         phone object irrespective of this config -->
    <bool name="config_switch_phone_on_voice_reg_state_change">true</bool>

    <!-- Config determines whether Memory Availability Notification is supported over Ims so that
         the RP-SMMA Notification is sent over Ims to SMS Service center indicating that UE can now
          start receiving SMS after failures due to Memory Full event -->
    <bool name="config_smma_notification_supported_over_ims">false</bool>

    <bool name="config_sms_force_7bit_encoding">false</bool>

    <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and
+1 −0
Original line number Diff line number Diff line
@@ -2810,6 +2810,7 @@
  <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" />
  <java-symbol type="string" name="whichHomeApplicationNamed" />
  <java-symbol type="string" name="whichHomeApplicationLabel" />
  <java-symbol type="bool" name="config_smma_notification_supported_over_ims" />
  <java-symbol type="bool" name="config_sms_force_7bit_encoding" />
  <java-symbol type="bool" name="config_defaultWindowFeatureOptionsPanel" />
  <java-symbol type="bool" name="config_defaultWindowFeatureContextMenu" />
+37 −0
Original line number Diff line number Diff line
@@ -3125,6 +3125,43 @@ public final class SmsManager {
        }
    }

    /**
     * Set Storage Availability in SmsStorageMonitor
     * @param storageAvailable storage availability to be set true or false
     * @hide
     */
    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
    @TestApi
    public void setStorageMonitorMemoryStatusOverride(boolean storageAvailable) {
        try {
            ISms iccISms = getISmsServiceOrThrow();
            if (iccISms != null) {
                iccISms.setStorageMonitorMemoryStatusOverride(getSubscriptionId(),
                                                                storageAvailable);
            }
        } catch (RemoteException ex) {
            ex.rethrowFromSystemServer();
        }
    }

    /**
     * Clear the memory status override set by
     * {@link #setStorageMonitorMemoryStatusOverride(boolean)}
     * @hide
     */
    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
    @TestApi
    public void clearStorageMonitorMemoryStatusOverride() {
        try {
            ISms iccISms = getISmsServiceOrThrow();
            if (iccISms != null) {
                iccISms.clearStorageMonitorMemoryStatusOverride(getSubscriptionId());
            }
        } catch (RemoteException ex) {
            ex.rethrowFromSystemServer();
        }
    }

    /** @hide */
    @Retention(RetentionPolicy.SOURCE)
    @IntDef(prefix = {"SMS_CATEGORY_"},
Loading