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

Commit 47c7675a authored by Cassie Han's avatar Cassie Han Committed by Gerrit Code Review
Browse files

Merge "Move SECRET_CODE_ACTION from Telephony.Sms.Intents to TelephonyManager."

parents 6717a6f9 6d0a571d

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -37169,7 +37169,7 @@ package android.provider { 
    field public static final int RESULT_SMS_HANDLED = 1; // 0x1

    field public static final int RESULT_SMS_OUT_OF_MEMORY = 3; // 0x3

    field public static final int RESULT_SMS_UNSUPPORTED = 4; // 0x4

    field public static final java.lang.String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";

    field public static final deprecated java.lang.String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";

    field public static final java.lang.String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL";

    field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";

    field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";
@@ -42580,6 +42580,7 @@ package android.telephony { 
    field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";

    field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

    field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

    field public static final java.lang.String ACTION_SECRET_CODE = "android.telephony.action.SECRET_CODE";

    field public static final java.lang.String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";

    field public static final java.lang.String ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED = "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED";

    field public static final int APPTYPE_CSIM = 4; // 0x4

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6101,6 +6101,10 @@ package android.telephony.ims.feature { 
    field public static final int STATE_UNAVAILABLE = 0; // 0x0

  }



  public static class ImsFeature.Capabilities {

    field protected int mCapabilities;

  }



  protected static class ImsFeature.CapabilityCallbackProxy {

    method public void onChangeCapabilityConfigurationError(int, int, int);

  }

telephony/java/android/provider/Telephony.java

+4 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.content.ContentResolver; 
import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.database.Cursor;

import android.database.ContentObserver;

import android.database.Cursor;

import android.database.sqlite.SqliteWrapper;

import android.net.Uri;

import android.telephony.Rlog;
@@ -41,7 +41,6 @@ import android.util.Patterns; 
import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.SmsApplication;





import java.util.HashSet;

import java.util.Set;

import java.util.regex.Matcher;
@@ -1127,7 +1126,10 @@ public final class Telephony { 
             *

             * <p>Requires {@code android.Manifest.permission#CONTROL_INCALL_EXPERIENCE} to

             * send and receive.</p>

             * @deprecated it is no longer supported, use {@link

             * TelephonyManager#ACTION_SECRET_CODE} instead

             */

            @Deprecated

            @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

            public static final String SECRET_CODE_ACTION =

                    "android.provider.Telephony.SECRET_CODE";

telephony/java/android/telephony/TelephonyManager.java

+18 −0
Original line number Diff line number Diff line
@@ -2497,6 +2497,24 @@ public class TelephonyManager { 
    public static final String ACTION_SIM_SLOT_STATUS_CHANGED =

            "android.telephony.action.SIM_SLOT_STATUS_CHANGED";



    /**

     * Broadcast Action: A debug code has been entered in the dialer.

     * <p>

     * This intent is broadcast by the system and OEM telephony apps may need to receive these

     * broadcasts. And it requires the sender to be default dialer or has carrier privileges

     * (see {@link #hasCarrierPrivileges}).

     * <p>

     * These "secret codes" are used to activate developer menus by dialing certain codes.

     * And they are of the form {@code *#*#&lt;code&gt;#*#*}. The intent will have the data

     * URI: {@code android_secret_code://&lt;code&gt;}. It is possible that a manifest

     * receiver would be woken up even if it is not currently running.

     * <p>

     * It is supposed to replace {@link Telephony#SECRET_CODE_ACTION} in the next Android version.

     * Before that both of these two actions will be broadcast.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_SECRET_CODE = "android.telephony.action.SECRET_CODE";



    /**

     * @return true if a ICC card is present

     */