diff options
| author | James Lemieux <jplemieux@google.com> | 2014-06-09 23:33:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-09 23:33:17 +0000 |
| commit | 97fb20697c1f2e03ad4aec20bc263e5bae3aa912 (patch) | |
| tree | 0cbe83b14ccc9aa6c2a8edcf37c8c7d4543b5688 /emailcommon | |
| parent | b1b9707b77b5f59a24329ffd21db7e6edaa30dd0 (diff) | |
| parent | 9250f4787222f8bc3afe539a2f351fd8d9875fba (diff) | |
| download | android_packages_apps_Email-97fb20697c1f2e03ad4aec20bc263e5bae3aa912.tar.gz android_packages_apps_Email-97fb20697c1f2e03ad4aec20bc263e5bae3aa912.tar.bz2 android_packages_apps_Email-97fb20697c1f2e03ad4aec20bc263e5bae3aa912.zip | |
Merge "Unit Tests for serialization of Account and HostAuth objects" into ub-mail-master
Diffstat (limited to 'emailcommon')
| -rwxr-xr-x | emailcommon/src/com/android/emailcommon/provider/Account.java | 7 | ||||
| -rw-r--r-- | emailcommon/src/com/android/emailcommon/provider/HostAuth.java | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java index f35195fcc..2e4075fce 100755 --- a/emailcommon/src/com/android/emailcommon/provider/Account.java +++ b/emailcommon/src/com/android/emailcommon/provider/Account.java @@ -35,6 +35,7 @@ import android.os.RemoteException; import com.android.emailcommon.utility.Utility; import com.android.mail.utils.LogUtils; +import com.google.common.annotations.VisibleForTesting; import org.json.JSONException; import org.json.JSONObject; @@ -141,8 +142,10 @@ public final class Account extends EmailContent implements Parcelable { public long mPolicyKey; public long mPingDuration; - private static final String JSON_TAG_HOST_AUTH_RECV = "hostAuthRecv"; - private static final String JSON_TAG_HOST_AUTH_SEND = "hostAuthSend"; + @VisibleForTesting + static final String JSON_TAG_HOST_AUTH_RECV = "hostAuthRecv"; + @VisibleForTesting + static final String JSON_TAG_HOST_AUTH_SEND = "hostAuthSend"; // Convenience for creating/working with an account public transient HostAuth mHostAuthRecv; diff --git a/emailcommon/src/com/android/emailcommon/provider/HostAuth.java b/emailcommon/src/com/android/emailcommon/provider/HostAuth.java index 6899a7d59..c23f276a8 100644 --- a/emailcommon/src/com/android/emailcommon/provider/HostAuth.java +++ b/emailcommon/src/com/android/emailcommon/provider/HostAuth.java @@ -27,6 +27,7 @@ import android.text.TextUtils; import com.android.emailcommon.utility.SSLUtils; import com.android.mail.utils.LogUtils; +import com.google.common.annotations.VisibleForTesting; import org.json.JSONException; import org.json.JSONObject; @@ -71,7 +72,8 @@ public class HostAuth extends EmailContent implements Parcelable { public byte[] mServerCert = null; public long mCredentialKey; - private static final String JSON_TAG_CREDENTIAL = "credential"; + @VisibleForTesting + static final String JSON_TAG_CREDENTIAL = "credential"; public transient Credential mCredential; public static final int CONTENT_ID_COLUMN = 0; |