Merge "Import revised translations" into froyo
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index b65a113..6a9d918 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -4697,6 +4697,8 @@
sortOrder, limit);
}
+ qb.setStrictProjectionMap(true);
+
Cursor cursor =
query(db, qb, projection, selection, selectionArgs, sortOrder, groupBy, limit);
if (readBooleanQueryParameter(uri, ContactCounts.ADDRESS_BOOK_INDEX_EXTRAS, false)) {
diff --git a/tests/src/com/android/providers/contacts/RestrictionExceptionsTest.java b/tests/src/com/android/providers/contacts/RestrictionExceptionsTest.java
index af97e1f..6209e54 100644
--- a/tests/src/com/android/providers/contacts/RestrictionExceptionsTest.java
+++ b/tests/src/com/android/providers/contacts/RestrictionExceptionsTest.java
@@ -326,4 +326,13 @@
// Generic query can read generic status
assertStatus(mRed, aggId, GENERIC_STATUS);
}
+
+ public void testStrictProjectionMap() {
+ try {
+ mGrey.provider.query(ContactsContract.Contacts.CONTENT_URI,
+ new String[] { "_id as noname, * FROM contacts--" }, null, null, null);
+ fail();
+ } catch (Exception e) {
+ }
+ }
}