diff options
| author | 2015-01-26 19:32:35 +0000 | |
|---|---|---|
| committer | 2015-01-26 19:32:36 +0000 | |
| commit | 361d45e67ae43996b5593b46c29f03aa648a0a6e (patch) | |
| tree | 3ea057e1de6f8572d25ba64ab209cf311b99c655 | |
| parent | c26f67051e12af7c2f17b71db39e01c1e0302fb1 (diff) | |
| parent | c73ae3aaf46a4f9618785ec3bdf0f53ce8efb4ca (diff) | |
Merge "Unhide getOrCreateThreadId"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index e6d088d17a85..ecdc8ff404e4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26139,6 +26139,8 @@ package android.provider { } public static final class Telephony.Threads implements android.provider.Telephony.ThreadsColumns { + method public static long getOrCreateThreadId(android.content.Context, java.lang.String); + method public static long getOrCreateThreadId(android.content.Context, java.util.Set<java.lang.String>); field public static final int BROADCAST_THREAD = 1; // 0x1 field public static final int COMMON_THREAD = 0; // 0x0 field public static final android.net.Uri CONTENT_URI; diff --git a/api/system-current.txt b/api/system-current.txt index e6ddb4f1f94d..3b30139e0613 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -27728,6 +27728,8 @@ package android.provider { } public static final class Telephony.Threads implements android.provider.Telephony.ThreadsColumns { + method public static long getOrCreateThreadId(android.content.Context, java.lang.String); + method public static long getOrCreateThreadId(android.content.Context, java.util.Set<java.lang.String>); field public static final int BROADCAST_THREAD = 1; // 0x1 field public static final int COMMON_THREAD = 0; // 0x0 field public static final android.net.Uri CONTENT_URI; |