diff options
| author | d34d <clark@cyngn.com> | 2015-11-10 10:47:58 -0800 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2015-11-12 10:06:12 -0800 |
| commit | aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b (patch) | |
| tree | 10b375898a3ea87b09fb3af86c8394d5bc9a4170 /services/java | |
| parent | a3f946d143b969cf7d385a6c2a1704d4d77dc04c (diff) | |
| download | frameworks_base-aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b.zip frameworks_base-aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b.tar.gz frameworks_base-aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b.tar.bz2 | |
fw: Move Secure settings to CMSettings
This moves all Settings.Secure.* settings that, were added to
CyanogenMod, to CMSettings.
* KEYBOARD_BRIGHTNESS
* BUTTON_BRIGHTNESS
* BUTTON_BACKLIGHT_TIMEOUT
* DEV_FORCE_SHOW_NAVBAR
* ADB_NOTIFY
* ADB_PORT
* DEVICE_HOSTNAME
* KILL_APP_LONGPRESS_BACK
* PROTECTED_COMPONENTS
* LIVE_DISPLAY_COLOR_MATRIX
* ADVANCED_REBOOT
* POWER_MENU_ACTIONS
* DEFAULT_THEME_COMPONENTS
* THEME_PREV_BOOT_API_LEVEL
Change-Id: I49e9160177ffc727b20008817ac2b5ce5e89ead5
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 8cfbac6..90a4dc1 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -102,6 +102,7 @@ import com.android.server.wallpaper.WallpaperManagerService; import com.android.server.webkit.WebViewUpdateService; import com.android.server.wm.WindowManagerService; +import cyanogenmod.providers.CMSettings; import dalvik.system.VMRuntime; import java.io.File; @@ -189,8 +190,8 @@ public final class SystemServer { } @Override public void onChange(boolean selfChange) { - int adbPort = Settings.Secure.getInt(mContentResolver, - Settings.Secure.ADB_PORT, 0); + int adbPort = CMSettings.Secure.getInt(mContentResolver, + CMSettings.Secure.ADB_PORT, 0); // setting this will control whether ADB runs on TCP/IP or USB SystemProperties.set("service.adb.tcp.port", Integer.toString(adbPort)); } @@ -1048,12 +1049,12 @@ public final class SystemServer { } // make sure the ADB_ENABLED setting value matches the secure property value - Settings.Secure.putInt(mContentResolver, Settings.Secure.ADB_PORT, + CMSettings.Secure.putInt(mContentResolver, CMSettings.Secure.ADB_PORT, Integer.parseInt(SystemProperties.get("service.adb.tcp.port", "-1"))); // register observer to listen for settings changes mContentResolver.registerContentObserver( - Settings.Secure.getUriFor(Settings.Secure.ADB_PORT), + CMSettings.Secure.getUriFor(CMSettings.Secure.ADB_PORT), false, new AdbPortObserver()); // Before things start rolling, be sure we have decided whether |