am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev (f63ca02f) · Commits · e / os / android_frameworks_base

api/17.txt

+15 −8

Original line number	Diff line number	Diff line
		@@ -18810,11 +18810,14 @@ package android.provider {
		field public static final java.lang.String ADB_ENABLED = "adb_enabled";
		field public static final java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
		field public static final java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
		field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
		field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
		field public static final java.lang.String AUTO_TIME = "auto_time";
		field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
		field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String DATA_ROAMING = "data_roaming";
		field public static final java.lang.String DEBUG_APP = "debug_app";
		field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
		field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
		field public static final java.lang.String HTTP_PROXY = "http_proxy";
		@@ -18825,10 +18828,13 @@ package android.provider {
		field public static final java.lang.String RADIO_CELL = "cell";
		field public static final java.lang.String RADIO_NFC = "nfc";
		field public static final java.lang.String RADIO_WIFI = "wifi";
		field public static final java.lang.String SHOW_PROCESSES = "show_processes";
		field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
		field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";
		field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
		field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
		field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
		field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
		field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
		field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
		field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
		@@ -18840,6 +18846,7 @@ package android.provider {
		field public static final int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2
		field public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1
		field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
		field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
		}

		public static class Settings.NameValueTable implements android.provider.BaseColumns {
		@@ -18954,9 +18961,9 @@ package android.provider {
		field public static final deprecated java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
		field public static final deprecated java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
		field public static final java.lang.String ALARM_ALERT = "alarm_alert";
		field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
		field public static final deprecated java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
		field public static final deprecated java.lang.String ANDROID_ID = "android_id";
		field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
		field public static final deprecated java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
		field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible";
		field public static final deprecated java.lang.String AUTO_TIME = "auto_time";
		field public static final deprecated java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
		@@ -18966,7 +18973,7 @@ package android.provider {
		field public static final android.net.Uri CONTENT_URI;
		field public static final deprecated java.lang.String DATA_ROAMING = "data_roaming";
		field public static final java.lang.String DATE_FORMAT = "date_format";
		field public static final java.lang.String DEBUG_APP = "debug_app";
		field public static final deprecated java.lang.String DEBUG_APP = "debug_app";
		field public static final android.net.Uri DEFAULT_ALARM_ALERT_URI;
		field public static final android.net.Uri DEFAULT_NOTIFICATION_URI;
		field public static final android.net.Uri DEFAULT_RINGTONE_URI;
		@@ -19005,7 +19012,7 @@ package android.provider {
		field public static final deprecated java.lang.String SETTINGS_CLASSNAME = "settings_classname";
		field public static final java.lang.String SETUP_WIZARD_HAS_RUN = "setup_wizard_has_run";
		field public static final java.lang.String SHOW_GTALK_SERVICE_STATUS = "SHOW_GTALK_SERVICE_STATUS";
		field public static final java.lang.String SHOW_PROCESSES = "show_processes";
		field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";
		field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";
		field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";
		field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
		@@ -19015,7 +19022,7 @@ package android.provider {
		field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";
		field public static final java.lang.String TEXT_SHOW_PASSWORD = "show_password";
		field public static final java.lang.String TIME_12_24 = "time_12_24";
		field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
		field public static final deprecated java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
		field public static final deprecated java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
		field public static final java.lang.String USER_ROTATION = "user_rotation";
		field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
		@@ -19028,8 +19035,8 @@ package android.provider {
		field public static final java.lang.String[] VOLUME_SETTINGS;
		field public static final java.lang.String VOLUME_SYSTEM = "volume_system";
		field public static final java.lang.String VOLUME_VOICE = "volume_voice";
		field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
		field public static final java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
		field public static final deprecated java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
		field public static final deprecated java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
		field public static final deprecated java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
		field public static final deprecated java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
		field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
		@@ -19057,7 +19064,7 @@ package android.provider {
		field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
		field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
		field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
		field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
		field public static final deprecated java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
		}

		public class SyncStateContract {

api/current.txt

+15 −8

Original line number	Diff line number	Diff line
		@@ -18815,11 +18815,14 @@ package android.provider {
		field public static final java.lang.String ADB_ENABLED = "adb_enabled";
		field public static final java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
		field public static final java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
		field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
		field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
		field public static final java.lang.String AUTO_TIME = "auto_time";
		field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
		field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String DATA_ROAMING = "data_roaming";
		field public static final java.lang.String DEBUG_APP = "debug_app";
		field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
		field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
		field public static final java.lang.String HTTP_PROXY = "http_proxy";
		@@ -18830,10 +18833,13 @@ package android.provider {
		field public static final java.lang.String RADIO_CELL = "cell";
		field public static final java.lang.String RADIO_NFC = "nfc";
		field public static final java.lang.String RADIO_WIFI = "wifi";
		field public static final java.lang.String SHOW_PROCESSES = "show_processes";
		field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
		field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";
		field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
		field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
		field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
		field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
		field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
		field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
		field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
		@@ -18845,6 +18851,7 @@ package android.provider {
		field public static final int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2
		field public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1
		field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
		field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
		}

		public static class Settings.NameValueTable implements android.provider.BaseColumns {
		@@ -18959,9 +18966,9 @@ package android.provider {
		field public static final deprecated java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
		field public static final deprecated java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
		field public static final java.lang.String ALARM_ALERT = "alarm_alert";
		field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
		field public static final deprecated java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
		field public static final deprecated java.lang.String ANDROID_ID = "android_id";
		field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
		field public static final deprecated java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
		field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible";
		field public static final deprecated java.lang.String AUTO_TIME = "auto_time";
		field public static final deprecated java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
		@@ -18971,7 +18978,7 @@ package android.provider {
		field public static final android.net.Uri CONTENT_URI;
		field public static final deprecated java.lang.String DATA_ROAMING = "data_roaming";
		field public static final java.lang.String DATE_FORMAT = "date_format";
		field public static final java.lang.String DEBUG_APP = "debug_app";
		field public static final deprecated java.lang.String DEBUG_APP = "debug_app";
		field public static final android.net.Uri DEFAULT_ALARM_ALERT_URI;
		field public static final android.net.Uri DEFAULT_NOTIFICATION_URI;
		field public static final android.net.Uri DEFAULT_RINGTONE_URI;
		@@ -19010,7 +19017,7 @@ package android.provider {
		field public static final deprecated java.lang.String SETTINGS_CLASSNAME = "settings_classname";
		field public static final java.lang.String SETUP_WIZARD_HAS_RUN = "setup_wizard_has_run";
		field public static final java.lang.String SHOW_GTALK_SERVICE_STATUS = "SHOW_GTALK_SERVICE_STATUS";
		field public static final java.lang.String SHOW_PROCESSES = "show_processes";
		field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";
		field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";
		field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";
		field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
		@@ -19020,7 +19027,7 @@ package android.provider {
		field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";
		field public static final java.lang.String TEXT_SHOW_PASSWORD = "show_password";
		field public static final java.lang.String TIME_12_24 = "time_12_24";
		field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
		field public static final deprecated java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
		field public static final deprecated java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
		field public static final java.lang.String USER_ROTATION = "user_rotation";
		field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
		@@ -19033,8 +19040,8 @@ package android.provider {
		field public static final java.lang.String[] VOLUME_SETTINGS;
		field public static final java.lang.String VOLUME_SYSTEM = "volume_system";
		field public static final java.lang.String VOLUME_VOICE = "volume_voice";
		field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
		field public static final java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
		field public static final deprecated java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
		field public static final deprecated java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
		field public static final deprecated java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
		field public static final deprecated java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
		field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
		@@ -19062,7 +19069,7 @@ package android.provider {
		field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
		field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
		field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
		field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
		field public static final deprecated java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
		}

		public class SyncStateContract {

core/java/android/inputmethodservice/InputMethodService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -683,8 +683,8 @@ public class InputMethodService extends AbstractInputMethodService {
		com.android.internal.R.layout.input_method, null);
		mWindow.setContentView(mRootView);
		mRootView.getViewTreeObserver().addOnComputeInternalInsetsListener(mInsetsComputer);
		if (Settings.System.getInt(getContentResolver(),
		Settings.System.FANCY_IME_ANIMATIONS, 0) != 0) {
		if (Settings.Global.getInt(getContentResolver(),
		Settings.Global.FANCY_IME_ANIMATIONS, 0) != 0) {
		mWindow.getWindow().setWindowAnimations(
		com.android.internal.R.style.Animation_InputMethodFancy);
		}

core/java/android/provider/Settings.java

+145 −64

File changed.

Preview size limit exceeded, changes collapsed.

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+54 −20

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		// database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'
		// is properly propagated through your change. Not doing so will result in a loss of user
		// settings.
		private static final int DATABASE_VERSION = 90;
		private static final int DATABASE_VERSION = 91;

		private Context mContext;
		private int mUserHandle;
		@@ -1400,6 +1400,39 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		upgradeVersion = 90;
		}

		if (upgradeVersion == 90) {
		if (mUserHandle == UserHandle.USER_OWNER) {
		db.beginTransaction();
		try {
		String[] systemToGlobal = {
		Settings.Global.WINDOW_ANIMATION_SCALE,
		Settings.Global.TRANSITION_ANIMATION_SCALE,
		Settings.Global.ANIMATOR_DURATION_SCALE,
		Settings.Global.FANCY_IME_ANIMATIONS,
		Settings.Global.COMPATIBILITY_MODE,
		Settings.Global.EMERGENCY_TONE,
		Settings.Global.CALL_AUTO_RETRY,
		Settings.Global.DEBUG_APP,
		Settings.Global.WAIT_FOR_DEBUGGER,
		Settings.Global.SHOW_PROCESSES,
		Settings.Global.ALWAYS_FINISH_ACTIVITIES,
		};
		String[] secureToGlobal = {
		Settings.Global.PREFERRED_NETWORK_MODE,
		Settings.Global.PREFERRED_CDMA_SUBSCRIPTION,
		};

		moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, systemToGlobal, true);
		moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, secureToGlobal, true);

		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}
		}
		upgradeVersion = 91;
		}

		// *** Remember to update DATABASE_VERSION above!

		if (upgradeVersion != currentVersion) {
		@@ -1816,12 +1849,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		loadIntegerSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT,
		R.integer.def_screen_off_timeout);

		// Set default cdma emergency tone
		loadSetting(stmt, Settings.System.EMERGENCY_TONE, 0);

		// Set default cdma call auto retry
		loadSetting(stmt, Settings.System.CALL_AUTO_RETRY, 0);

		// Set default cdma DTMF type
		loadSetting(stmt, Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, 0);

		@@ -1846,9 +1873,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE,
		R.bool.def_notification_pulse);
		loadSetting(stmt, Settings.Global.SET_INSTALL_LOCATION, 0);
		loadSetting(stmt, Settings.Global.DEFAULT_INSTALL_LOCATION,
		PackageHelper.APP_INSTALL_AUTO);

		loadUISoundEffectsSettings(stmt);

		@@ -1912,16 +1936,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		loadSetting(stmt, Settings.Secure.WIFI_WATCHDOG_WATCH_LIST, wifiWatchList);
		}

		// Set the preferred network mode to 0 = Global, CDMA default
		int type;
		if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) {
		type = Phone.NT_MODE_GLOBAL;
		} else {
		type = SystemProperties.getInt("ro.telephony.default_network",
		RILConstants.PREFERRED_NETWORK_MODE);
		}
		loadSetting(stmt, Settings.Secure.PREFERRED_NETWORK_MODE, type);

		// Don't do this. The SystemServer will initialize ADB_ENABLED from a
		// persistent system property instead.
		//loadSetting(stmt, Settings.Secure.ADB_ENABLED, 0);
		@@ -2105,6 +2119,26 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		loadStringSetting(stmt, Settings.Global.UNLOCK_SOUND,
		R.string.def_unlock_sound);

		loadSetting(stmt, Settings.Global.SET_INSTALL_LOCATION, 0);
		loadSetting(stmt, Settings.Global.DEFAULT_INSTALL_LOCATION,
		PackageHelper.APP_INSTALL_AUTO);

		// Set default cdma emergency tone
		loadSetting(stmt, Settings.Global.EMERGENCY_TONE, 0);

		// Set default cdma call auto retry
		loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0);

		// Set the preferred network mode to 0 = Global, CDMA default
		int type;
		if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) {
		type = Phone.NT_MODE_GLOBAL;
		} else {
		type = SystemProperties.getInt("ro.telephony.default_network",
		RILConstants.PREFERRED_NETWORK_MODE);
		}
		loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);

		// --- New global settings start here
		} finally {
		if (stmt != null) stmt.close();