Merge "More migration to Global settings." into jb-mr1-dev (5831159b) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -634,7 +634,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		final ContentResolver cr = mContentResolver;

		int ringerModeFromSettings =
		Settings.Global.getInt(cr, System.MODE_RINGER, AudioManager.RINGER_MODE_NORMAL);
		Settings.Global.getInt(
		cr, Settings.Global.MODE_RINGER, AudioManager.RINGER_MODE_NORMAL);
		int ringerMode = ringerModeFromSettings;
		// sanity check in case the settings are restored from a device with incompatible
		// ringer modes
		@@ -645,7 +646,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		ringerMode = AudioManager.RINGER_MODE_SILENT;
		}
		if (ringerMode != ringerModeFromSettings) {
		Settings.Global.putInt(cr, System.MODE_RINGER, ringerMode);
		Settings.Global.putInt(cr, Settings.Global.MODE_RINGER, ringerMode);
		}
		synchronized(mSettingsLock) {
		mRingerMode = ringerMode;
		@@ -3118,7 +3119,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		}

		private void persistRingerMode(int ringerMode) {
		Settings.Global.putInt(mContentResolver, System.MODE_RINGER, ringerMode);
		Settings.Global.putInt(mContentResolver, Settings.Global.MODE_RINGER, ringerMode);
		}

		private void playSoundEffect(int effectType, int volume) {

packages/SystemUI/src/com/android/systemui/BootReceiver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ public class BootReceiver extends BroadcastReceiver {
		try {
		// Start the load average overlay, if activated
		ContentResolver res = context.getContentResolver();
		if (Settings.System.getInt(res, Settings.System.SHOW_PROCESSES, 0) != 0) {
		if (Settings.Global.getInt(res, Settings.Global.SHOW_PROCESSES, 0) != 0) {
		Intent loadavg = new Intent(context, com.android.systemui.LoadAverageService.class);
		context.startService(loadavg);
		}

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -237,9 +237,9 @@ public class PowerUI extends SystemUI {
		}

		final ContentResolver cr = mContext.getContentResolver();
		if (Settings.System.getInt(cr, Settings.System.POWER_SOUNDS_ENABLED, 1) == 1) {
		final String soundPath = Settings.System.getString(cr,
		Settings.System.LOW_BATTERY_SOUND);
		if (Settings.Global.getInt(cr, Settings.Global.POWER_SOUNDS_ENABLED, 1) == 1) {
		final String soundPath = Settings.Global.getString(cr,
		Settings.Global.LOW_BATTERY_SOUND);
		if (soundPath != null) {
		final Uri soundUri = Uri.parse("file://" + soundPath);
		if (soundUri != null) {

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1912,15 +1912,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		Intent service = new Intent();
		service.setClassName(mContext, "com.android.server.LoadAverageService");
		ContentResolver res = mContext.getContentResolver();
		boolean shown = Settings.System.getInt(
		res, Settings.System.SHOW_PROCESSES, 0) != 0;
		boolean shown = Settings.Global.getInt(
		res, Settings.Global.SHOW_PROCESSES, 0) != 0;
		if (!shown) {
		mContext.startService(service);
		} else {
		mContext.stopService(service);
		}
		Settings.System.putInt(
		res, Settings.System.SHOW_PROCESSES, shown ? 0 : 1);
		Settings.Global.putInt(
		res, Settings.Global.SHOW_PROCESSES, shown ? 0 : 1);
		return -1;
		}
		}

services/java/com/android/server/am/ActivityManagerService.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -7251,11 +7251,11 @@ public final class ActivityManagerService extends ActivityManagerNative
		// care about.
		if (persistent) {
		final ContentResolver resolver = mContext.getContentResolver();
		Settings.System.putString(
		resolver, Settings.System.DEBUG_APP,
		Settings.Global.putString(
		resolver, Settings.Global.DEBUG_APP,
		packageName);
		Settings.System.putInt(
		resolver, Settings.System.WAIT_FOR_DEBUGGER,
		Settings.Global.putInt(
		resolver, Settings.Global.WAIT_FOR_DEBUGGER,
		waitForDebugger ? 1 : 0);
		}

		@@ -7317,9 +7317,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		enforceCallingPermission(android.Manifest.permission.SET_ALWAYS_FINISH,
		"setAlwaysFinish()");

		Settings.System.putInt(
		Settings.Global.putInt(
		mContext.getContentResolver(),
		Settings.System.ALWAYS_FINISH_ACTIVITIES, enabled ? 1 : 0);
		Settings.Global.ALWAYS_FINISH_ACTIVITIES, enabled ? 1 : 0);

		synchronized (this) {
		mAlwaysFinishActivities = enabled;
		@@ -7596,12 +7596,12 @@ public final class ActivityManagerService extends ActivityManagerNative

		private void retrieveSettings() {
		final ContentResolver resolver = mContext.getContentResolver();
		String debugApp = Settings.System.getString(
		resolver, Settings.System.DEBUG_APP);
		boolean waitForDebugger = Settings.System.getInt(
		resolver, Settings.System.WAIT_FOR_DEBUGGER, 0) != 0;
		boolean alwaysFinishActivities = Settings.System.getInt(
		resolver, Settings.System.ALWAYS_FINISH_ACTIVITIES, 0) != 0;
		String debugApp = Settings.Global.getString(
		resolver, Settings.Global.DEBUG_APP);
		boolean waitForDebugger = Settings.Global.getInt(
		resolver, Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0;
		boolean alwaysFinishActivities = Settings.Global.getInt(
		resolver, Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0;

		Configuration configuration = new Configuration();
		Settings.System.getConfiguration(resolver, configuration);