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

Commit 601afcfd authored by Ta-wei Yen's avatar Ta-wei Yen Committed by android-build-merger
Browse files

Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev am: dfbc8517 

am: 904e1856

Change-Id: I2066d699def9e921df3a2fd12a709a01b5e7795a
parents 2cb384b1 904e1856

core/java/android/provider/VoicemailContract.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class VoicemailContract { 
    /** @hide */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_VOICEMAIL_SMS_RECEIVED =

            "android.intent.action.VOICEMAIL_SMS_RECEIVED";

            "com.android.internal.provider.action.VOICEMAIL_SMS_RECEIVED";



    /**

     * Extra in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} indicating the content of the SMS.

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ 
    <protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_UNREGISTERED" />

    <protected-broadcast android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />

    <protected-broadcast android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />

    <protected-broadcast android:name="android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION" />



    <protected-broadcast android:name="com.android.bluetooth.btservice.action.ALARM_WAKEUP" />

    <protected-broadcast android:name="com.android.server.action.NETWORK_STATS_POLL" />