diff options
| author | Fred Quintana <fredq@google.com> | 2009-08-15 21:45:26 -0700 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2009-08-15 22:40:25 -0700 |
| commit | ffd0cb04f97e62d286d185c520580d81a9c328b1 (patch) | |
| tree | d864589d0cfa54abc971091b172d1497cb79adcb /tests/FrameworkTest | |
| parent | fa2944d93f4c5050fb4a99d90006791c2995b31c (diff) | |
| download | frameworks_base-ffd0cb04f97e62d286d185c520580d81a9c328b1.zip frameworks_base-ffd0cb04f97e62d286d185c520580d81a9c328b1.tar.gz frameworks_base-ffd0cb04f97e62d286d185c520580d81a9c328b1.tar.bz2 | |
do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
Diffstat (limited to 'tests/FrameworkTest')
| -rw-r--r-- | tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java b/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java index 42c1e78..a8af7f8 100644 --- a/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java +++ b/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java @@ -74,8 +74,8 @@ public class AbstractTableMergerTest extends AndroidTestCase { if (syncVersion != null) values.put("_sync_version", syncVersion); if (syncId != null) values.put("_sync_id", syncId); if (syncAccount != null) { - values.put("_sync_account", syncAccount.mName); - values.put("_sync_account_type", syncAccount.mType); + values.put("_sync_account", syncAccount.name); + values.put("_sync_account_type", syncAccount.type); } values.put("_sync_local_id", syncLocalId); values.put("_sync_dirty", 0); @@ -88,8 +88,8 @@ public class AbstractTableMergerTest extends AndroidTestCase { if (syncVersion != null) values.put("_sync_version", syncVersion); if (syncId != null) values.put("_sync_id", syncId); if (syncAccount != null) { - values.put("_sync_account", syncAccount.mName); - values.put("_sync_account_type", syncAccount.mType); + values.put("_sync_account", syncAccount.name); + values.put("_sync_account_type", syncAccount.type); } if (syncLocalId != null) values.put("_sync_local_id", syncLocalId); return values; |