From 9382b6a75fb1e7bf6c73d1185e8119f8bb34c563 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Thu, 23 Feb 2017 17:49:45 -0600
Subject: CMSettingsProvider: remove per-user cursor observation

We don't need it because we don't support using the returned cursor
directly, and it can cause deadlocks when being called from platform
code.

Change-Id: I2f85be1152569ba27e4622d310d867e20965faa3
---
 .../src/org/cyanogenmod/cmsettings/CMSettingsProvider.java    | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'packages/CMSettingsProvider')

diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
index d730584..a4630df 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
@@ -470,17 +470,6 @@ public class CMSettingsProvider extends ContentProvider {
                     null, sortOrder);
         }
 
-        // the default Cursor interface does not support per-user observation
-        try {
-            AbstractCursor abstractCursor = (AbstractCursor) returnCursor;
-            abstractCursor.setNotificationUri(getContext().getContentResolver(), uri, userId);
-        } catch (ClassCastException e) {
-            // details of the concrete Cursor implementation have changed and this code has
-            // not been updated to match -- complain and fail hard.
-            Log.wtf(TAG, "Incompatible cursor derivation");
-            throw e;
-        }
-
         return returnCursor;
     }
 
-- 
cgit v1.1


From 9d47788ad96807342bc72106a5bc86e73615e2ae Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Fri, 28 Apr 2017 14:28:58 -0700
Subject: Automatic translation import

Change-Id: Icc238269d1036f83019d8dd0f38c84d326b1a65f
---
 packages/CMSettingsProvider/res/values-en-rAU/strings.xml | 4 +++-
 packages/CMSettingsProvider/res/values-en-rGB/strings.xml | 4 +++-
 packages/CMSettingsProvider/res/values-sq-rAL/strings.xml | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'packages/CMSettingsProvider')

diff --git a/packages/CMSettingsProvider/res/values-en-rAU/strings.xml b/packages/CMSettingsProvider/res/values-en-rAU/strings.xml
index 0647eaf..3cbb401 100644
--- a/packages/CMSettingsProvider/res/values-en-rAU/strings.xml
+++ b/packages/CMSettingsProvider/res/values-en-rAU/strings.xml
@@ -15,4 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources></resources>
+<resources>
+  <string name="app_name">CM Settings Storage</string>
+</resources>
diff --git a/packages/CMSettingsProvider/res/values-en-rGB/strings.xml b/packages/CMSettingsProvider/res/values-en-rGB/strings.xml
index 0647eaf..3cbb401 100644
--- a/packages/CMSettingsProvider/res/values-en-rGB/strings.xml
+++ b/packages/CMSettingsProvider/res/values-en-rGB/strings.xml
@@ -15,4 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources></resources>
+<resources>
+  <string name="app_name">CM Settings Storage</string>
+</resources>
diff --git a/packages/CMSettingsProvider/res/values-sq-rAL/strings.xml b/packages/CMSettingsProvider/res/values-sq-rAL/strings.xml
index 0647eaf..c6fd42b 100644
--- a/packages/CMSettingsProvider/res/values-sq-rAL/strings.xml
+++ b/packages/CMSettingsProvider/res/values-sq-rAL/strings.xml
@@ -15,4 +15,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources></resources>
+<resources>
+  <string name="app_name">Memoria e Parametrave të CM</string>
+</resources>
-- 
cgit v1.1