commit 361d45e67ae43996b5593b46c29f03aa648a0a6e
author Brian Attwell <brianattwell@google.com> Mon Jan 26 19:32:35 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 26 19:32:36 2015 +0000
tree 3ea057e1de6f8572d25ba64ab209cf311b99c655
parent c26f67051e12af7c2f17b71db39e01c1e0302fb1
parent c73ae3aaf46a4f9618785ec3bdf0f53ce8efb4ca

Merge "Unhide getOrCreateThreadId"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e6d088d..ecdc8ff 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26139,6 +26139,8 @@
   }
 
   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;

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index e6ddb4f..3b30139 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -27728,6 +27728,8 @@
   }
 
   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;