Merge change 22383 into eclair

* changes:
  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

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)

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"/>