summaryrefslogtreecommitdiff
path: root/core/java/android/content/ContentResolver.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-11-15 14:01:46 -0800
committerAmith Yamasani <yamasani@google.com>2012-12-11 09:50:50 -0800
commit7a96c39c510923ef73bbb06ab20109f0168b8eb1 (patch)
tree70fd480a814add0fdcb274540e1f421806020f24 /core/java/android/content/ContentResolver.java
parent151cb90c6093d5b4371b9367b507f8aa7c1a4370 (diff)
Move lingering services to services.jar.
This helps reduce the pressure on framework.jar, and makes it clear that it should only be used by the system_server. Bug: 7333397 Change-Id: I0858904239535380fbf30562b793e277d8c3f054
Diffstat (limited to 'core/java/android/content/ContentResolver.java')
-rw-r--r--core/java/android/content/ContentResolver.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index b20cf8839119..e34c827d290e 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -116,6 +116,10 @@ public abstract class ContentResolver {
*/
public static final String SYNC_EXTRAS_INITIALIZE = "initialize";
+ /** @hide */
+ public static final Intent ACTION_SYNC_CONN_STATUS_CHANGED =
+ new Intent("com.android.sync.SYNC_CONN_STATUS_CHANGED");
+
public static final String SCHEME_CONTENT = "content";
public static final String SCHEME_ANDROID_RESOURCE = "android.resource";
public static final String SCHEME_FILE = "file";
@@ -181,7 +185,7 @@ public abstract class ContentResolver {
};
/** @hide */
- static String syncErrorToString(int error) {
+ public static String syncErrorToString(int error) {
if (error < 1 || error > SYNC_ERROR_NAMES.length) {
return String.valueOf(error);
}