diff options
| author | Scott Su <scott.su@myriadgroup.com> | 2009-08-20 22:34:55 +0800 |
|---|---|---|
| committer | Wei Huang <weih@google.com> | 2009-08-22 10:48:23 -0700 |
| commit | 527f015b9a99b64a20bcbfe6aad78e815365c760 (patch) | |
| tree | ee54b725ea4e4e64bd45c13716e3c9f4cb742ab0 | |
| parent | 5f5989de7cac3583a2217b03e9661d2abb1a1d70 (diff) | |
| download | frameworks_base-527f015b9a99b64a20bcbfe6aad78e815365c760.zip frameworks_base-527f015b9a99b64a20bcbfe6aad78e815365c760.tar.gz frameworks_base-527f015b9a99b64a20bcbfe6aad78e815365c760.tar.bz2 | |
Remove the decleration of com.android.im.plugin.jar in platform.xml
Add a column definition for keep_signed_in when query the active account with a given provider
| -rw-r--r-- | core/java/android/provider/Im.java | 3 | ||||
| -rw-r--r-- | data/etc/platform.xml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/provider/Im.java b/core/java/android/provider/Im.java index d7e8f70..f126c4d 100644 --- a/core/java/android/provider/Im.java +++ b/core/java/android/provider/Im.java @@ -138,6 +138,7 @@ public class Im { public static final String ACTIVE_ACCOUNT_USERNAME = "account_username"; public static final String ACTIVE_ACCOUNT_PW = "account_pw"; public static final String ACTIVE_ACCOUNT_LOCKED = "account_locked"; + public static final String ACTIVE_ACCOUNT_KEEP_SIGNED_IN = "account_keepSignedIn"; public static final String ACCOUNT_PRESENCE_STATUS = "account_presenceStatus"; public static final String ACCOUNT_CONNECTION_STATUS = "account_connStatus"; @@ -1467,7 +1468,7 @@ public class Im { * <P>Type: TEXT</P> */ String UNSENT_COMPOSED_MESSAGE = "unsent_composed_message"; - + /** * A value from 0-9 indicating which quick-switch chat screen slot this * chat is occupying. If none (for instance, this is the 12th active chat) diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 20aa6e7..7322e6c 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -146,8 +146,6 @@ <library name="android.test.runner" file="/system/framework/android.test.runner.jar" /> - <library name="com.android.im.plugin" - file="/system/framework/com.android.im.plugin.jar"/> <library name="javax.obex" file="/system/framework/javax.obex.jar"/> |