resolve merge conflicts of ad31603 to cw-f-dev (bbfb9746) · Commits · e / os / android_frameworks_base

core/java/android/provider/VoicemailContract.java

+18 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.provider.CallLog.Calls;
		import android.telecom.PhoneAccount;
		import android.telecom.PhoneAccountHandle;
		import android.telecom.Voicemail;

		import java.util.List;

		/**
		@@ -123,21 +122,35 @@ public class VoicemailContract {
		"android.intent.action.VOICEMAIL_SMS_RECEIVED";

		/**
		* Extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to indicate the
		* event type of the SMS. Common values are "SYNC" or "STATUS"
		* Optional extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to
		* indicate the event type of the SMS. Common values are "SYNC" or "STATUS". The extra will not
		* exist if the framework cannot parse the SMS as voicemail but the carrier pattern indicates
		* it is.
		*/
		/** @hide */
		public static final String EXTRA_VOICEMAIL_SMS_PREFIX =
		"com.android.voicemail.extra.VOICEMAIL_SMS_PREFIX";

		/**
		* Extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to indicate the
		* fields sent by the SMS
		* Optional extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to
		* indicate the fields sent by the SMS. The extra will not exist if the framework cannot
		* parse the SMS as voicemail but the carrier pattern indicates it is.
		*/
		/** @hide */
		public static final String EXTRA_VOICEMAIL_SMS_FIELDS =
		"com.android.voicemail.extra.VOICEMAIL_SMS_FIELDS";

		/**
		* Extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to indicate the
		* message body of the SMS. This extra is included if the framework cannot
		* parse the SMS as voicemail but the carrier pattern indicates it is.
		*/
		/**
		* @hide
		*/
		public static final String EXTRA_VOICEMAIL_SMS_MESSAGE_BODY =
		"com.android.voicemail.extra.VOICEMAIL_SMS_MESSAGE_BODY";

		/**
		* Extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to indicate he
		* subscription ID of the phone account that received the SMS.

core/res/res/values/config.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -2531,4 +2531,13 @@

		<string name="config_networkOverLimitComponent" translatable="false">com.android.systemui/com.android.systemui.net.NetworkOverLimitActivity</string>
		<string name="config_dataUsageSummaryComponent" translatable="false">com.android.settings/com.android.settings.Settings$DataUsageSummaryActivity</string>

		<!-- A array of regex to treat a SMS as VVM SMS if the message body matches.
		Each item represents an entry, which consists of two parts:
		a comma (,) separated list of MCCMNC the regex applies to, followed by a semicolon (;), and
		then the regex itself. -->
		<string-array translatable="false" name="config_vvmSmsFilterRegexes">
		<!-- Verizon requires any SMS that starts with //VZWVVM to be treated as a VVM SMS-->
		<item>310004,310010,310012,310013,310590,310890,310910,311110,311270,311271,311272,311273,311274,311275,311276,311277,311278,311279,311280,311281,311282,311283,311284,311285,311286,311287,311288,311289,311390,311480,311481,311482,311483,311484,311485,311486,311487,311488,311489;^//VZWVVM.*</item>
		</string-array>
		</resources>

core/res/res/values/symbols.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -2268,6 +2268,8 @@
		<java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" />
		<java-symbol type="id" name="profile_button" />

		<java-symbol type="array" name="config_vvmSmsFilterRegexes" />

		<!-- Cascading submenus -->
		<java-symbol type="dimen" name="cascading_menus_min_smallest_width" />