summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-06-28 00:29:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-26 23:50:27 +0000
commit44c76c97bc3af0523a3cc57bc218a22faa8215a2 (patch)
treeef828bbb434e225b9733783b13c5128988ed4d74
parent079d13e246103182736abd8625e77076553d9e10 (diff)
parent284660104fe3dd63263af9c6e90db90d07a6cfbc (diff)
downloadframeworks_base-44c76c97bc3af0523a3cc57bc218a22faa8215a2.zip
frameworks_base-44c76c97bc3af0523a3cc57bc218a22faa8215a2.tar.gz
frameworks_base-44c76c97bc3af0523a3cc57bc218a22faa8215a2.tar.bz2
Merge "Change the framework api for a constant in CallLog.Calls"
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 009655c..de26fe3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22870,7 +22870,6 @@ package android.provider {
field public static final java.lang.String CACHED_NUMBER_LABEL = "numberlabel";
field public static final java.lang.String CACHED_NUMBER_TYPE = "numbertype";
field public static final java.lang.String CACHED_PHOTO_ID = "photo_id";
- field public static final java.lang.String SUBSCRIPTION_COMPONENT_NAME = "component_name";
field public static final android.net.Uri CONTENT_FILTER_URI;
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/calls";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/calls";
@@ -22894,6 +22893,7 @@ package android.provider {
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 SUBSCRIPTION_COMPONENT_NAME = "subscription_component_name";
field public static final java.lang.String SUBSCRIPTION_ID = "subscription_id";
field public static final java.lang.String TYPE = "type";
field public static final int VOICEMAIL_TYPE = 4; // 0x4