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

Commit a314e8e2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "API revisions in SmsManager and TelephonyManager" into rvc-dev am: 7f4be5cf 

Change-Id: Ib2d14a5e356872df65b3b9dd1e06819b06b8b5ab
parents e840a7b3 7f4be5cf

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47833,6 +47833,7 @@ package android.telephony { 
    method @Deprecated public void sendMultimediaMessage(android.content.Context, android.net.Uri, String, android.os.Bundle, android.app.PendingIntent);

    method public void sendMultipartTextMessage(String, String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);

    method public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, long);

    method public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String);

    method public void sendTextMessage(String, String, String, android.app.PendingIntent, android.app.PendingIntent);

    method public void sendTextMessage(@NonNull String, @Nullable String, @NonNull String, @Nullable android.app.PendingIntent, @Nullable android.app.PendingIntent, long);

    method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.SEND_SMS}) public void sendTextMessageWithoutPersisting(String, String, String, android.app.PendingIntent, android.app.PendingIntent);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -11397,7 +11397,6 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public java.util.List<android.telephony.SmsMessage> getMessagesFromIcc();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getPremiumSmsConsent(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getSmsCapacityOnIcc();

    method public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void sendMultipartTextMessageWithoutPersisting(String, String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPremiumSmsConsent(@NonNull String, int);

    field public static final int PREMIUM_SMS_CONSENT_ALWAYS_ALLOW = 3; // 0x3
@@ -11495,6 +11494,7 @@ package android.telephony { 
    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();

    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CallForwardingInfo getCallForwarding(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCallWaitingStatus();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);
@@ -11513,7 +11513,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getDataActivationState();

    method @Deprecated public boolean getDataEnabled();

    method @Deprecated public boolean getDataEnabled(int);

    method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);

    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getDefaultRespondViaMessageApplication();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3738,7 +3738,6 @@ package android.telephony { 


  public final class SmsManager {

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int checkSmsShortCodeDestination(String, String);

    method public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String);

    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
@@ -3759,9 +3758,10 @@ package android.telephony { 
  public class TelephonyManager {

    method public int addDevicePolicyOverrideApn(@NonNull android.content.Context, @NonNull android.telephony.data.ApnSetting);

    method public int checkCarrierPrivilegesForPackage(String);

    method @Nullable @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();

    method public int getCarrierIdListVersion();

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);

    method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);

    method @Nullable @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public android.content.ComponentName getDefaultRespondViaMessageApplication();

    method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getEmergencyNumberDbVersion();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();

telephony/java/android/telephony/SmsManager.java

+0 −4
Original line number Diff line number Diff line
@@ -975,11 +975,7 @@ public final class SmsManager { 
     *

     * @param packageName serves as the default package name if the package name that is

     *        associated with the user id is null.

     *

     * @hide

     */

    @SystemApi

    @TestApi

    public void sendMultipartTextMessage(

            @NonNull String destinationAddress, @Nullable String scAddress,

            @NonNull List<String> parts, @Nullable List<PendingIntent> sentIntents,

telephony/java/android/telephony/TelephonyManager.java

+18 −6
Original line number Diff line number Diff line
@@ -9977,18 +9977,30 @@ public class TelephonyManager { 
    }



    /**

     * Gets the default Respond Via Message application

     * @param context context from the calling app

     * @param updateIfNeeded update the default app if there is no valid default app configured.

     * Gets the default Respond Via Message application, updating the cache if there is no

     * respond-via-message application currently configured.

     * @return component name of the app and class to direct Respond Via Message intent to, or

     * {@code null} if the functionality is not supported.

     * @hide

     */

    @SystemApi

    @TestApi

    public static @Nullable ComponentName getDefaultRespondViaMessageApplication(

            @NonNull Context context, boolean updateIfNeeded) {

        return SmsApplication.getDefaultRespondViaMessageApplication(context, updateIfNeeded);

    @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS)

    public @Nullable ComponentName getAndUpdateDefaultRespondViaMessageApplication() {

        return SmsApplication.getDefaultRespondViaMessageApplication(mContext, true);

    }



    /**

     * Gets the default Respond Via Message application.

     * @return component name of the app and class to direct Respond Via Message intent to, or

     * {@code null} if the functionality is not supported.

     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS)

    public @Nullable ComponentName getDefaultRespondViaMessageApplication() {

        return SmsApplication.getDefaultRespondViaMessageApplication(mContext, false);

    }



    /**