Merge change Ie7d26695 into eclair
* changes:
Modify the "active chats" uri to not overlap with other uris.
diff --git a/core/java/android/provider/Im.java b/core/java/android/provider/Im.java
index d3e2820..025d5c2 100644
--- a/core/java/android/provider/Im.java
+++ b/core/java/android/provider/Im.java
@@ -540,7 +540,7 @@
* The content:// style URL for contacts who have an open chat session
*/
public static final Uri CONTENT_URI_CHAT_CONTACTS =
- Uri.parse("content://com.google.android.providers.talk/contacts/chatting");
+ Uri.parse("content://com.google.android.providers.talk/contacts_chatting");
/**
* The content:// style URL for contacts who have been blocked