summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavis Mosenkovs <davikovs@gmail.com>2015-02-27 08:17:30 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-02-27 17:43:18 +0000
commit8fdf78cce0a5ba613724c99cdf955a65e9617550 (patch)
tree311b861b7fe14547bf511da6d4cdda54204b57a7
parent742e6cb5071d7db6c777321998266df305a09b2a (diff)
downloadandroid_frameworks_base-8fdf78cce0a5ba613724c99cdf955a65e9617550.tar.gz
android_frameworks_base-8fdf78cce0a5ba613724c99cdf955a65e9617550.tar.bz2
android_frameworks_base-8fdf78cce0a5ba613724c99cdf955a65e9617550.zip
Settings: Don't attempt to forward writes from System -> Global.
This breaks 3rd party apps since they can't get access to WRITE_SECURE_SETTINGS. Change-Id: I9c3b19eea046ccd2664ff92f7c0493a911c353e2
-rw-r--r--core/java/android/provider/Settings.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9482ca0e4b5..555e921df4b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1411,9 +1411,8 @@ public final class Settings {
}
if (MOVED_TO_GLOBAL.contains(name) || MOVED_TO_SECURE_THEN_GLOBAL.contains(name)) {
Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.System"
- + " to android.provider.Settings.Global.");
-
- return Global.putStringForUser(resolver, name, value, userHandle);
+ + " to android.provider.Settings.Global, value is unchanged.");
+ return false;
}
return sNameValueCache.putStringForUser(resolver, name, value, userHandle);
}