diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 20:02:21 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 20:02:21 +0200 |
| commit | 0ac71bdacc0db01ce195ab92673b494e4ff6bf34 (patch) | |
| tree | 67ede43d05cc3ed09cd9452b903a01c025da6255 /packages | |
| parent | 73652644f26b3cd0cbc7a2a4a310cee4d10dc38b (diff) | |
| parent | 9d47788ad96807342bc72106a5bc86e73615e2ae (diff) | |
| download | vendor_cmsdk-replicant-6.0.zip vendor_cmsdk-replicant-6.0.tar.gz vendor_cmsdk-replicant-6.0.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/cm_platform_sdk into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'packages')
4 files changed, 9 insertions, 14 deletions
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> 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; } |