Merge "Use putIntForUser to turn off ambient display secure settings" (efab39ff) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -565,21 +565,21 @@ public class UserRestrictionsUtils {
		break;
		case UserManager.DISALLOW_AMBIENT_DISPLAY:
		if (newValue) {
		android.provider.Settings.Secure.putString(
		android.provider.Settings.Secure.putIntForUser(
		context.getContentResolver(),
		Settings.Secure.DOZE_ENABLED, "0");
		android.provider.Settings.Secure.putString(
		Settings.Secure.DOZE_ENABLED, 0, userId);
		android.provider.Settings.Secure.putIntForUser(
		context.getContentResolver(),
		Settings.Secure.DOZE_ALWAYS_ON, "0");
		android.provider.Settings.Secure.putString(
		Settings.Secure.DOZE_ALWAYS_ON, 0, userId);
		android.provider.Settings.Secure.putIntForUser(
		context.getContentResolver(),
		Settings.Secure.DOZE_PULSE_ON_PICK_UP, "0");
		android.provider.Settings.Secure.putString(
		Settings.Secure.DOZE_PULSE_ON_PICK_UP, 0, userId);
		android.provider.Settings.Secure.putIntForUser(
		context.getContentResolver(),
		Settings.Secure.DOZE_PULSE_ON_LONG_PRESS, "0");
		android.provider.Settings.Secure.putString(
		Settings.Secure.DOZE_PULSE_ON_LONG_PRESS, 0, userId);
		android.provider.Settings.Secure.putIntForUser(
		context.getContentResolver(),
		Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, "0");
		Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, 0, userId);
		}
		break;
		case UserManager.DISALLOW_CONFIG_LOCATION: