summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-27 19:38:23 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-27 19:38:23 -0400
commit4b35d699e1ebd8f3d25b8300ff9c3923547f14d0 (patch)
treeb876af28611cb16c673f0d633dbf2ba5a7988ecc
parentd021ea27cea0ea14ad0e0295eaa51c94e92946fc (diff)
parentf582a69dd2ed556d48a4c158b6560c08e44386fd (diff)
downloadframeworks_base-4b35d699e1ebd8f3d25b8300ff9c3923547f14d0.zip
frameworks_base-4b35d699e1ebd8f3d25b8300ff9c3923547f14d0.tar.gz
frameworks_base-4b35d699e1ebd8f3d25b8300ff9c3923547f14d0.tar.bz2
Merge change 27342 into eclair
* changes: Don't back up / restore "allow apps from unknown sources"
-rw-r--r--core/java/android/provider/Settings.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 2b6313d..1cd4506 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2405,7 +2405,6 @@ public final class Settings {
public static final String[] SETTINGS_TO_BACKUP = {
ADB_ENABLED,
ALLOW_MOCK_LOCATION,
- INSTALL_NON_MARKET_APPS,
PARENTAL_CONTROL_ENABLED,
PARENTAL_CONTROL_REDIRECT_URL,
USB_MASS_STORAGE_ENABLED,