Merge "Add transient to Account (for holding AccountManager account)"

This commit is contained in:
Marc Blank 2011-06-02 09:41:28 -07:00 committed by Android (Google) Code Review
commit a613aa18f5

View File

@ -1097,10 +1097,12 @@ public abstract class EmailContent {
public String mSignature; public String mSignature;
public long mPolicyKey; public long mPolicyKey;
// Convenience for creating an account // Convenience for creating/working with an account
public transient HostAuth mHostAuthRecv; public transient HostAuth mHostAuthRecv;
public transient HostAuth mHostAuthSend; public transient HostAuth mHostAuthSend;
public transient Policy mPolicy; public transient Policy mPolicy;
// Might hold the corresponding AccountManager account structure
public transient android.accounts.Account mAmAccount;
public static final int CONTENT_ID_COLUMN = 0; public static final int CONTENT_ID_COLUMN = 0;
public static final int CONTENT_DISPLAY_NAME_COLUMN = 1; public static final int CONTENT_DISPLAY_NAME_COLUMN = 1;