Don't crash if a bad value sneaks in.

Change-Id: I4e45f7a8b374aa56b763cc3e75f7a310a90bb417
Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into aosp
ContactsProvider: Dutch translations

Change-Id: Ieb80f85e9b165d4384c8569a020fb5cccb8d216d
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into aosp-merge
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into HEAD
ContactsProvider : Add new projection columns for contact

http://review.cyanogenmod.org/#/c/29191/2 introduced new columns
to be used for projection, however SQLiteQueryBuilder's projectionmap
was not updated. This is required to avoid this error :

E/DatabaseUtils(12835): Writing exception to parcel
E/DatabaseUtils(12835): java.lang.IllegalArgumentException: Invalid column display_name
E/DatabaseUtils(12835): 	at android.database.sqlite.SQLiteQueryBuilder.computeProjection(SQLiteQueryBuilder.java:632)
E/DatabaseUtils(12835): 	at android.database.sqlite.SQLiteQueryBuilder.buildQuery(SQLiteQueryBuilder.java:447)
E/DatabaseUtils(12835): 	at android.database.sqlite.SQLiteQueryBuilder.query(SQLiteQueryBuilder.java:393)
E/DatabaseUtils(12835): 	at com.android.providers.contacts.ContactsProvider2.query(ContactsProvider2.java:6016)
E/DatabaseUtils(12835): 	at com.android.providers.contacts.ContactsProvider2.queryLocal(ContactsProvider2.java:5992)
E/DatabaseUtils(12835): 	at com.android.providers.contacts.ContactsProvider2.query(ContactsProvider2.java:4780)
E/DatabaseUtils(12835): 	at android.content.ContentProvider$Transport.query(ContentProvider.java:189)
E/DatabaseUtils(12835): 	at android.content.ContentResolver.query(ContentResolver.java:372)
E/DatabaseUtils(12835): 	at android.content.ContentResolver.query(ContentResolver.java:315)
E/DatabaseUtils(12835): 	at com.android.vcard.VCardComposer.initInterCursorCreationPart(VCardComposer.java:440)
E/DatabaseUtils(12835): 	at com.android.vcard.VCardComposer.init(VCardComposer.java:399)
E/DatabaseUtils(12835): 	at com.android.vcard.VCardComposer.init(VCardComposer.java:346)
E/DatabaseUtils(12835): 	at com.android.providers.contacts.ContactsProvider2.outputRawContactsAsVCard(ContactsProvider2.java:7572)
E/DatabaseUtils(12835): 	at com.android.providers.contacts.ContactsProvider2.openAssetFileLocal(ContactsProvider2.java:7329)
E/DatabaseUtils(12835): 	at com.android.providers.contacts.ContactsProvider2.openAssetFile(ContactsProvider2.java:7128)
E/DatabaseUtils(12835): 	at android.content.ContentProvider.openTypedAssetFile(ContentProvider.java:937)
E/DatabaseUtils(12835): 	at android.content.ContentProvider$Transport.openTypedAssetFile(ContentProvider.java:268)
E/DatabaseUtils(12835): 	at android.content.ContentProviderNative.onTransact(ContentProviderNative.java:283)
E/DatabaseUtils(12835): 	at android.os.Binder.execTransact(Binder.java:351)
E/DatabaseUtils(12835): 	at dalvik.system.NativeStart.run(Native Method)

Change-Id: I8ad094296a8a20b7c483b815510314dcbeb2e9ca
Czech: fixed translation

Change-Id: I9fb08152e2fcb1c1315fe945176720001ff4267a
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into 1.1

Android 4.2.2 release 1
contacts: Privacy Guard support

 * If privacy guard is enabled for the calling process, return an empty
   MemoryCursor (with column names populated) instead of the real dataset.

Change-Id: I78b16f3791706636d51785e46a1f2ec656a3c9d2
Use MemoryCursor code in framework.

That way, we need to fix bugs only once.

Change-Id: Iae3df411462b7adc12aa09a5ea7ec6f01834ac0d
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Revert "contacts: Privacy Guard support"

Also revert "Use MemoryCursor code in framework."

Change-Id: I278e3e41421693ccb309366a69ff53092e03261e
Fix IllegalArgumentException.

Include alternative display name in the phone lookup projection, since
the BT app needs it. Fixes this backtrace:

D BluetoothPbapObexServer: search by number, requestSize=1 offset=0 searchValue=4436029097
E DatabaseUtils: Writing exception to parcel
E DatabaseUtils: java.lang.IllegalArgumentException: Invalid column display_name_alt
E DatabaseUtils: 	at android.database.sqlite.SQLiteQueryBuilder.computeProjection(SQLiteQueryBuilder.java:632)
E DatabaseUtils: 	at android.database.sqlite.SQLiteQueryBuilder.buildQuery(SQLiteQueryBuilder.java:447)
E DatabaseUtils: 	at android.database.sqlite.SQLiteQueryBuilder.query(SQLiteQueryBuilder.java:393)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.query(ContactsProvider2.java:6066)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.queryLocal(ContactsProvider2.java:5846)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.queryInternal(ContactsProvider2.java:4810)
E DatabaseUtils: 	at com.android.providers.contacts.ContactsProvider2.query(ContactsProvider2.java:4773)
E DatabaseUtils: 	at android.content.ContentProvider$Transport.query(ContentProvider.java:189)
E DatabaseUtils: 	at android.content.ContentProviderNative.onTransact(ContentProviderNative.java:113)
E DatabaseUtils: 	at android.os.Binder.execTransact(Binder.java:351)
E DatabaseUtils: 	at dalvik.system.NativeStart.run(Native Method)

Change-Id: I15f531c5b0ea4b0a4a9de864872dd3256667e568
JIRA:CYAN-2204
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into cm-10.2

Android 4.3 Release 3.1
Merge "Revert "contacts: Privacy Guard support"" into cm-10.2
ContactsProvider: Fix polyphones in Chinese.

    Merge the resolution for polyphones in Chinese from https://github.com/ShenduOS/android_packages_providers_ContactsProvider/commit/d232513ba086fd0508def8ef0f7fb7d9cec5d171, thanks the Shendu OS team.

    Patch Set 2:
       Format the code style.

Change-Id: I84d5921ec43502bcfd2a1aefd4cae9fd0600c9d1
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1
Add one column for subscription in callLog database.

Add one column for subscription in callLog database
to mark the call state.

Change-Id: Ibac1d8c0d3ab13663ee44ad5cf04c5bde21ac0f0
CRs-Fixed: 590662
Merge remote-tracking branch 'cm/cm-11.0' into kk4.4