commit 88eda6b450fa4709c79506b7fd45175556568bdb
author Peter Nilsson <peter7.nilsson@sonymobile.com> Sun Jan 18 11:38:40 2015 +0100
committer Johan Redestig <johan.redestig@sonymobile.com> Tue Jun 30 06:09:57 2015 +0000
tree 64e8190cf26bce8c7cb1d8043ca74f8abf892011
parent 306cf9474c1ef5a4013c8e3c561749716c2b2522

Exception in TestAccessHistory tearDown

CTS test will report a exception in TestAccessHistory
method tearDown, when having the AOSP Browser installed.
The reason for this is that in setup the bookmarks are saved
as a backup and in teardown they are restored to the data base.
But the BrowserProvider in AOSP Browser does not delete the
bookmarks, only mark them as deleted. So in tearDown when the
bookmarks is restored there will be a exception in SQLite
because the ID exist.
Fix: Do not include the ID when backing up the bookmark

Change-Id: Iba1031958bffbfcccd03ae792ced2d7ffde9b5bf
(cherry picked from commit ed80c0eab9f388a3291f2005b2242a956dc58f7e)

tests/tests/provider/src/android/provider/cts/BrowserTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/BrowserTest.java b/tests/tests/provider/src/android/provider/cts/BrowserTest.java
index 2f0432a..9f96412 100644
--- a/tests/tests/provider/src/android/provider/cts/BrowserTest.java
+++ b/tests/tests/provider/src/android/provider/cts/BrowserTest.java
@@ -84,7 +84,9 @@
                     value.put(colNames[i], cursor.getFloat(i));
                     break;
                 case Cursor.FIELD_TYPE_INTEGER:
-                    value.put(colNames[i], cursor.getLong(i));
+                    if (!"_ID".equalsIgnoreCase(colNames[i])) {
+                        value.put(colNames[i], cursor.getLong(i));
+                    }
                     break;
                 case Cursor.FIELD_TYPE_STRING:
                     value.put(colNames[i], cursor.getString(i));