Add Android OS version to EAS User-Agent; update EAS version

Bug: 2953691

Change-Id: I2b2b16c7cb8950a644306b2aa25bcc53ab0c2731
diff --git a/src/com/android/exchange/Eas.java b/src/com/android/exchange/Eas.java
index 14dc537..00179ba 100644
--- a/src/com/android/exchange/Eas.java
+++ b/src/com/android/exchange/Eas.java
@@ -37,7 +37,7 @@
     public static final int DEBUG_EXCHANGE_BIT = 2;
     public static final int DEBUG_FILE_BIT = 4;
 
-    public static final String VERSION = "0.3";
+    public static final String CLIENT_VERSION = "EAS-1.2";
     public static final String ACCOUNT_MAILBOX_PREFIX = "__eas";
 
     // Define our default protocol version as 2.5 (Exchange 2003)
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index f5b3c1d..fdaaab7 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -80,6 +80,7 @@
 import android.content.Entity;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.SystemClock;
@@ -1206,7 +1207,8 @@
         method.setHeader("Authorization", mAuthString);
         method.setHeader("MS-ASProtocolVersion", mProtocolVersion);
         method.setHeader("Connection", "keep-alive");
-        method.setHeader("User-Agent", mDeviceType + '/' + Eas.VERSION);
+        method.setHeader("User-Agent", mDeviceType + '-' + Build.VERSION.RELEASE + '/' +
+                Eas.CLIENT_VERSION);
         if (usePolicyKey) {
             // If there's an account in existence, use its key; otherwise (we're creating the
             // account), send "0".  The server will respond with code 449 if there are policies