Merge "Add EXTRA_PHONE_ACCOUNT_HANDLE for ACTION_SHOW_VOICEMAIL_NOTIFICATION" (9f2888d9) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -39628,6 +39628,7 @@ package android.telephony {
		field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";
		field public static final java.lang.String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";
		field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telephony.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_STATE = "state";
		field public static final java.lang.String EXTRA_STATE_IDLE;
		field public static final java.lang.String EXTRA_STATE_OFFHOOK;

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -43029,6 +43029,7 @@ package android.telephony {
		field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";
		field public static final java.lang.String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";
		field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telephony.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_STATE = "state";
		field public static final java.lang.String EXTRA_STATE_IDLE;
		field public static final java.lang.String EXTRA_STATE_OFFHOOK;

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -39813,6 +39813,7 @@ package android.telephony {
		field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";
		field public static final java.lang.String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";
		field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telephony.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_STATE = "state";
		field public static final java.lang.String EXTRA_STATE_IDLE;
		field public static final java.lang.String EXTRA_STATE_OFFHOOK;

telephony/java/android/telephony/TelephonyManager.java

+15 −7

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ import static com.android.internal.util.Preconditions.checkNotNull;
		import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.app.ActivityThread;
		import android.app.PendingIntent;
		import android.content.ContentResolver;
		@@ -32,9 +32,6 @@ import android.content.Intent;
		import android.net.ConnectivityManager;
		import android.net.Uri;
		import android.os.BatteryStats;
		import android.os.Binder;
		import android.provider.Settings;
		import android.provider.Settings.SettingNotFoundException;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.PersistableBundle;
		@@ -42,11 +39,11 @@ import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceManager;
		import android.os.SystemProperties;
		import android.provider.Settings;
		import android.provider.Settings.SettingNotFoundException;
		import android.service.carrier.CarrierIdentifier;
		import android.telecom.PhoneAccount;
		import android.telecom.PhoneAccountHandle;
		import android.telephony.ClientRequestStats;
		import android.telephony.TelephonyHistogram;
		import android.telephony.ims.feature.ImsFeature;
		import android.util.Log;

		@@ -64,7 +61,6 @@ import com.android.internal.telephony.TelephonyProperties;

		import java.io.FileInputStream;
		import java.io.IOException;
		import java.io.UnsupportedEncodingException;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		@@ -747,6 +743,8 @@ public class TelephonyManager {
		* notification.
		*
		* <p>
		* The {@link #EXTRA_PHONE_ACCOUNT_HANDLE} extra indicates which {@link PhoneAccountHandle} the
		* voicemail is received on.
		* The {@link #EXTRA_NOTIFICATION_COUNT} extra indicates the total numbers of unheard
		* voicemails.
		* The {@link #EXTRA_VOICEMAIL_NUMBER} extra indicates the voicemail number if available.
		@@ -757,6 +755,7 @@ public class TelephonyManager {
		* {@link android.app.PendingIntent} that will launch the voicemail settings. This extra is only
		* available when the voicemail number is not set.
		*
		* @see #EXTRA_PHONE_ACCOUNT_HANDLE
		* @see #EXTRA_NOTIFICATION_COUNT
		* @see #EXTRA_VOICEMAIL_NUMBER
		* @see #EXTRA_CALL_VOICEMAIL_INTENT
		@@ -765,6 +764,15 @@ public class TelephonyManager {
		public static final String ACTION_SHOW_VOICEMAIL_NOTIFICATION =
		"android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";

		/**
		* The extra used with an {@link #ACTION_SHOW_VOICEMAIL_NOTIFICATION} {@code Intent} to specify
		* the {@link PhoneAccountHandle} the notification is for.
		* <p class="note">
		* Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.
		*/
		public static final String EXTRA_PHONE_ACCOUNT_HANDLE =
		"android.telephony.extra.PHONE_ACCOUNT_HANDLE";

		/**
		* The number of voice messages associated with the notification.
		*/