commit 534032610c6701b63ab94f0336beeb9f4a830f2d
author Dianne Hackborn <hackbod@google.com> Wed May 06 10:53:37 2009 -0700
committer Dianne Hackborn <hackbod@google.com> Wed May 06 10:53:37 2009 -0700
tree 061667064db9ea0dffa3475e199e7aa99f812d04
parent 8f0e556bb41c1e124612a27aaa52b2b6e9237ecd

Fix [Issue 1835218]

IllegalStateException already initialized in SyncStorageEngine.init
I used the wrong column name for the new account type.

core/java/android/content/SyncStorageEngine.java

diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java
index 64b626d..e240e65 100644
--- a/core/java/android/content/SyncStorageEngine.java
+++ b/core/java/android/content/SyncStorageEngine.java
@@ -1174,7 +1174,7 @@
             HashMap<String,String> map = new HashMap<String,String>();
             map.put("_id", "status._id as _id");
             map.put("account", "stats.account as account");
-            map.put("type", "stats.type as type");
+            map.put("account_type", "stats.account_type as account_type");
             map.put("authority", "stats.authority as authority");
             map.put("totalElapsedTime", "totalElapsedTime");
             map.put("numSyncs", "numSyncs");
@@ -1193,7 +1193,7 @@
             Cursor c = qb.query(db, null, null, null, null, null, null);
             while (c.moveToNext()) {
                 String accountName = c.getString(c.getColumnIndex("account"));
-                String accountType = c.getString(c.getColumnIndex("type"));
+                String accountType = c.getString(c.getColumnIndex("account_type"));
                 if (accountType == null) {
                     accountType = "com.google.GAIA";
                 }