From 9fc2d9abb7b5034e86006d360ba49c8b1b55058c Mon Sep 17 00:00:00 2001
From: Chiao Cheng <chiaocheng@google.com>
Date: Fri, 22 Nov 2013 16:05:02 -0800
Subject: Fixes cases when a contact was deleted via the contacts app.

In this case, the contact id of the raw contact is nulled out. This has the
side effect of making the IN clause of sqlite never equal.  Similar to:

SELECT 1 as id WHERE id NOT IN (SELECT null);

always returns 0 rows because the comparison to null is always false.

Protect against this case by eliminating null contact ids.

Bug: 11826565
Change-Id: Ide9b150bb7f94d03c210d43dbc8cdd5c42c21cf9
---
 src/com/android/providers/contacts/ContactsProvider2.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index d94191ca..3ea307ae 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5005,10 +5005,14 @@ public class ContactsProvider2 extends AbstractContactsProvider
                                             " FROM " + Tables.RAW_CONTACTS +
                                             " WHERE " + RawContactsColumns.ACCOUNT_ID + " = ?1" +
                                             " AND " + RawContactsColumns.CONCRETE_CONTACT_ID +
+                                            " IS NOT NULL" +
+                                            " AND " + RawContactsColumns.CONCRETE_CONTACT_ID +
                                             " NOT IN (" +
                                             "    SELECT " + RawContactsColumns.CONCRETE_CONTACT_ID +
                                             "    FROM " + Tables.RAW_CONTACTS +
                                             "    WHERE " + RawContactsColumns.ACCOUNT_ID + " != ?1"
+                                            + "  AND " + RawContactsColumns.CONCRETE_CONTACT_ID +
+                                            "    IS NOT NULL"
                                             + ")", accountIdParams);
                             try {
                                 while (cursor.moveToNext()) {
-- 
cgit v1.2.3


From e0be61ce716dc45b50875e5f4d28397c780f6479 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Thu, 27 Nov 2014 14:15:32 +0200
Subject: Automatic translation import

Change-Id: I6774800bd0d30065f5410dd1fa125b314f19d377
---
 res/values-ar/cm_strings.xml | 21 +++++++++++++++++++++
 res/values-hr/cm_strings.xml | 21 +++++++++++++++++++++
 res/values-ro/cm_strings.xml | 21 +++++++++++++++++++++
 res/values-sv/cm_strings.xml |  1 +
 4 files changed, 64 insertions(+)
 create mode 100644 res/values-ar/cm_strings.xml
 create mode 100644 res/values-hr/cm_strings.xml
 create mode 100644 res/values-ro/cm_strings.xml

diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
new file mode 100644
index 00000000..e4b66353
--- /dev/null
+++ b/res/values-ar/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="group_family">العائلة</string>
+  <string name="group_friend">الأصدقاء</string>
+  <string name="group_work">زملاء العمل</string>
+</resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
new file mode 100644
index 00000000..03f4df95
--- /dev/null
+++ b/res/values-hr/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="group_family">Obitelj</string>
+  <string name="group_friend">Prijatelji</string>
+  <string name="group_work">Suradnici</string>
+</resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
new file mode 100644
index 00000000..01b9eedc
--- /dev/null
+++ b/res/values-ro/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="group_family">Familie</string>
+  <string name="group_friend">Prieteni</string>
+  <string name="group_work">Colegi de serviciu</string>
+</resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index f7cdbd5d..d46606b9 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -17,4 +17,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="group_family">Familj</string>
   <string name="group_friend">Vänner</string>
+  <string name="group_work">Medarbetare</string>
 </resources>
-- 
cgit v1.2.3