Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-30 01:51:51 +00:00
committed by Android (Google) Code Review
parent 33813bd439 a302ac69e4
commit dfbc8517ee
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/VoicemailContract.java
View File

@@ -112,7 +112,7 @@ public class VoicemailContract {
/** @hide */ /** @hide */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_VOICEMAIL_SMS_RECEIVED = 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. * Extra in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} indicating the content of the SMS.

1
core/res/AndroidManifest.xml
View File

@@ -444,6 +444,7 @@
<protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_UNREGISTERED" /> <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.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />
<protected-broadcast android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" /> <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.bluetooth.btservice.action.ALARM_WAKEUP" />
<protected-broadcast android:name="com.android.server.action.NETWORK_STATS_POLL" /> <protected-broadcast android:name="com.android.server.action.NETWORK_STATS_POLL" />