am a8f55d15: am 5a9a76b5: am 9abe5673: Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev
* commit 'a8f55d158c9926afbf5ab2f8f4434d8db5447e0e':
Add Calls.TRANSCRIPTION to CallLog (2/2)
diff --git a/api/current.txt b/api/current.txt
index c2ba4a3..71f4b19 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23965,6 +23965,7 @@
field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
+ field public static final java.lang.String TRANSCRIPTION = "transcription";
field public static final java.lang.String TYPE = "type";
field public static final int VOICEMAIL_TYPE = 4; // 0x4
field public static final java.lang.String VOICEMAIL_URI = "voicemail_uri";
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 1157704..47cfa7d 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -265,6 +265,12 @@
public static final String VOICEMAIL_URI = "voicemail_uri";
/**
+ * Transcription of the call or voicemail entry. This will only be populated for call log
+ * entries of type {@link #VOICEMAIL_TYPE} that have valid transcriptions.
+ */
+ public static final String TRANSCRIPTION = "transcription";
+
+ /**
* Whether this item has been read or otherwise consumed by the user.
* <p>
* Unlike the {@link #NEW} field, which requires the user to have acknowledged the