summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorDanesh M <danesh@cyngn.com>2016-05-13 13:09:15 -0700
committerDanesh M <daneshm90@gmail.com>2016-05-13 13:36:30 -0700
commit971ea687427cc8ca09093fde962aadf90704f516 (patch)
tree53c8efc3b5d01b2bfe85bbcbba64c7f6e4a23b35 /packages/SettingsProvider
parentc3de534b5f13e62791899163d79521f3fa446a71 (diff)
downloadframeworks_base-971ea687427cc8ca09093fde962aadf90704f516.zip
frameworks_base-971ea687427cc8ca09093fde962aadf90704f516.tar.gz
frameworks_base-971ea687427cc8ca09093fde962aadf90704f516.tar.bz2
CMSettings : Move force_show_navbar to global
Keep feature inline with 12.1, only allow owner to control the feature and mirror across users. Also add additional checks for moved settings. OPO-696 Change-Id: I81c942ab106fead12020107b99c0795a5b9aac98
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 8515fdc..a3aeaa9 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2087,7 +2087,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
}
String[] systemToSecure = new String[] {
- CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR,
+ CMSettings.Global.DEV_FORCE_SHOW_NAVBAR,
CMSettings.Secure.KEYBOARD_BRIGHTNESS,
CMSettings.Secure.BUTTON_BRIGHTNESS,
CMSettings.Secure.BUTTON_BACKLIGHT_TIMEOUT