Add support for post-dial digits to logs.
Bug: 24955678
Change-Id: I03c1be349231492fc9dc7c9a3ae5983d5a44779c
diff --git a/api/current.txt b/api/current.txt
index 55b5d52..5c49dfa 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25035,6 +25035,7 @@
field public static final int OUTGOING_TYPE = 2; // 0x2
field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";
field public static final java.lang.String PHONE_ACCOUNT_ID = "subscription_id";
+ field public static final java.lang.String POST_DIAL_DIGITS = "post_dial_digits";
field public static final int PRESENTATION_ALLOWED = 1; // 0x1
field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
diff --git a/api/system-current.txt b/api/system-current.txt
index 06cbfa7..425d271 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -26993,6 +26993,7 @@
field public static final int OUTGOING_TYPE = 2; // 0x2
field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";
field public static final java.lang.String PHONE_ACCOUNT_ID = "subscription_id";
+ field public static final java.lang.String POST_DIAL_DIGITS = "post_dial_digits";
field public static final int PRESENTATION_ALLOWED = 1; // 0x1
field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 342f8c7..4b63c36 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -38,7 +38,6 @@
import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
-import android.util.Log;
import com.android.internal.telephony.CallerInfo;
import com.android.internal.telephony.PhoneConstants;
@@ -406,6 +405,14 @@
public static final String SUB_ID = "sub_id";
/**
+ * The post-dial portion of a dialed number, including any digits dialed after a
+ * {@link TelecomManager#DTMF_CHARACTER_PAUSE} or a {@link
+ * TelecomManager#DTMF_CHARACTER_WAIT} and these characters themselves.
+ * <P>Type: TEXT</P>
+ */
+ public static final String POST_DIAL_DIGITS = "post_dial_digits";
+
+ /**
* If a successful call is made that is longer than this duration, update the phone number
* in the ContactsProvider with the normalized version of the number, based on the user's
* current country code.
@@ -436,7 +443,7 @@
public static Uri addCall(CallerInfo ci, Context context, String number,
int presentation, int callType, int features, PhoneAccountHandle accountHandle,
long start, int duration, Long dataUsage) {
- return addCall(ci, context, number, presentation, callType, features, accountHandle,
+ return addCall(ci, context, number, "", presentation, callType, features, accountHandle,
start, duration, dataUsage, false, false);
}
@@ -466,10 +473,11 @@
* {@hide}
*/
public static Uri addCall(CallerInfo ci, Context context, String number,
- int presentation, int callType, int features, PhoneAccountHandle accountHandle,
- long start, int duration, Long dataUsage, boolean addForAllUsers) {
- return addCall(ci, context, number, presentation, callType, features, accountHandle,
- start, duration, dataUsage, addForAllUsers, false);
+ String postDialDigits, int presentation, int callType, int features,
+ PhoneAccountHandle accountHandle, long start, int duration, Long dataUsage,
+ boolean addForAllUsers) {
+ return addCall(ci, context, number, postDialDigits, presentation, callType, features,
+ accountHandle, start, duration, dataUsage, addForAllUsers, false);
}
/**
@@ -479,6 +487,8 @@
* if the contact is unknown.
* @param context the context used to get the ContentResolver
* @param number the phone number to be added to the calls db
+ * @param postDialDigits the post-dial digits that were dialed after the number,
+ * if it was outgoing. Otherwise it is ''.
* @param presentation enum value from PhoneConstants.PRESENTATION_xxx, which
* is set by the network and denotes the number presenting rules for
* "allowed", "payphone", "restricted" or "unknown"
@@ -499,8 +509,9 @@
* {@hide}
*/
public static Uri addCall(CallerInfo ci, Context context, String number,
- int presentation, int callType, int features, PhoneAccountHandle accountHandle,
- long start, int duration, Long dataUsage, boolean addForAllUsers, boolean is_read) {
+ String postDialDigits, int presentation, int callType, int features,
+ PhoneAccountHandle accountHandle, long start, int duration, Long dataUsage,
+ boolean addForAllUsers, boolean is_read) {
final ContentResolver resolver = context.getContentResolver();
int numberPresentation = PRESENTATION_ALLOWED;
@@ -551,6 +562,7 @@
ContentValues values = new ContentValues(6);
values.put(NUMBER, number);
+ values.put(POST_DIAL_DIGITS, postDialDigits);
values.put(NUMBER_PRESENTATION, Integer.valueOf(numberPresentation));
values.put(TYPE, Integer.valueOf(callType));
values.put(FEATURES, features);