Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5fa3648 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

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
parents 688b0f12 527f015b

core/java/android/provider/Im.java

+2 −1
Original line number Diff line number Diff line
@@ -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";

data/etc/platform.xml

+0 −2
Original line number Diff line number Diff line
@@ -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"/>