Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add an API to disable/restore doze settings" into tm-dev

Browse Source
This commit is contained in:
Louis Chang
2022-03-31 06:41:05 +00:00
committed by Android (Google) Code Review
parent f13bfa6c0a 38c73670a4
commit 97c8cee1a3
3 changed files with 108 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/test-current.txt
View File

@@ -1191,6 +1191,9 @@ package android.hardware.display {
method public boolean alwaysOnAvailable(); method public boolean alwaysOnAvailable();
method public boolean alwaysOnAvailableForUser(int); method public boolean alwaysOnAvailableForUser(int);
method public boolean alwaysOnEnabled(int); method public boolean alwaysOnEnabled(int);
method public void disableDozeSettings(int);
method public void disableDozeSettings(boolean, int);
method public void restoreDozeSettings(int);
} }
public final class DisplayManager { public final class DisplayManager {

131
core/java/android/hardware/display/AmbientDisplayConfiguration.java
View File

@@ -22,14 +22,18 @@ import android.os.Build;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.SparseArray;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import java.util.Map;
/** /**
* AmbientDisplayConfiguration encapsulates reading access to the configuration of ambient display. * AmbientDisplayConfiguration encapsulates reading access to the configuration of ambient display.
* *
* {@hide} * @hide
*/ */
@TestApi @TestApi
public class AmbientDisplayConfiguration { public class AmbientDisplayConfiguration {
@@ -37,14 +41,33 @@ public class AmbientDisplayConfiguration {
private final Context mContext; private final Context mContext;
private final boolean mAlwaysOnByDefault; private final boolean mAlwaysOnByDefault;
/** {@hide} */ /** Copied from android.provider.Settings.Secure since these keys are hidden. */
private static final String[] DOZE_SETTINGS = {
Settings.Secure.DOZE_ENABLED,
Settings.Secure.DOZE_ALWAYS_ON,
Settings.Secure.DOZE_PICK_UP_GESTURE,
Settings.Secure.DOZE_PULSE_ON_LONG_PRESS,
Settings.Secure.DOZE_DOUBLE_TAP_GESTURE,
Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,
Settings.Secure.DOZE_TAP_SCREEN_GESTURE
};
/** Non-user configurable doze settings */
private static final String[] NON_USER_CONFIGURABLE_DOZE_SETTINGS = {
Settings.Secure.DOZE_QUICK_PICKUP_GESTURE
};
final SparseArray<Map<String, String>> mUsersInitialValues = new SparseArray<>();
/** @hide */
@TestApi @TestApi
public AmbientDisplayConfiguration(Context context) { public AmbientDisplayConfiguration(Context context) {
mContext = context; mContext = context;
mAlwaysOnByDefault = mContext.getResources().getBoolean(R.bool.config_dozeAlwaysOnEnabled); mAlwaysOnByDefault = mContext.getResources().getBoolean(R.bool.config_dozeAlwaysOnEnabled);
} }
/** {@hide} */ /** @hide */
public boolean enabled(int user) { public boolean enabled(int user) {
return pulseOnNotificationEnabled(user) return pulseOnNotificationEnabled(user)
|| pulseOnLongPressEnabled(user) || pulseOnLongPressEnabled(user)
@@ -58,35 +81,35 @@ public class AmbientDisplayConfiguration {
|| screenOffUdfpsEnabled(user); || screenOffUdfpsEnabled(user);
} }
/** {@hide} */ /** @hide */
public boolean pulseOnNotificationEnabled(int user) { public boolean pulseOnNotificationEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_ENABLED, user) return boolSettingDefaultOn(Settings.Secure.DOZE_ENABLED, user)
&& pulseOnNotificationAvailable(); && pulseOnNotificationAvailable();
} }
/** {@hide} */ /** @hide */
public boolean pulseOnNotificationAvailable() { public boolean pulseOnNotificationAvailable() {
return ambientDisplayAvailable(); return ambientDisplayAvailable();
} }
/** {@hide} */ /** @hide */
public boolean pickupGestureEnabled(int user) { public boolean pickupGestureEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_PICK_UP_GESTURE, user) return boolSettingDefaultOn(Settings.Secure.DOZE_PICK_UP_GESTURE, user)
&& dozePickupSensorAvailable(); && dozePickupSensorAvailable();
} }
/** {@hide} */ /** @hide */
public boolean dozePickupSensorAvailable() { public boolean dozePickupSensorAvailable() {
return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup); return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup);
} }
/** {@hide} */ /** @hide */
public boolean tapGestureEnabled(int user) { public boolean tapGestureEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_TAP_SCREEN_GESTURE, user) return boolSettingDefaultOn(Settings.Secure.DOZE_TAP_SCREEN_GESTURE, user)
&& tapSensorAvailable(); && tapSensorAvailable();
} }
/** {@hide} */ /** @hide */
public boolean tapSensorAvailable() { public boolean tapSensorAvailable() {
for (String tapType : tapSensorTypeMapping()) { for (String tapType : tapSensorTypeMapping()) {
if (!TextUtils.isEmpty(tapType)) { if (!TextUtils.isEmpty(tapType)) {
@@ -96,18 +119,18 @@ public class AmbientDisplayConfiguration {
return false; return false;
} }
/** {@hide} */ /** @hide */
public boolean doubleTapGestureEnabled(int user) { public boolean doubleTapGestureEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, user) return boolSettingDefaultOn(Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, user)
&& doubleTapSensorAvailable(); && doubleTapSensorAvailable();
} }
/** {@hide} */ /** @hide */
public boolean doubleTapSensorAvailable() { public boolean doubleTapSensorAvailable() {
return !TextUtils.isEmpty(doubleTapSensorType()); return !TextUtils.isEmpty(doubleTapSensorType());
} }
/** {@hide} */ /** @hide */
public boolean quickPickupSensorEnabled(int user) { public boolean quickPickupSensorEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_QUICK_PICKUP_GESTURE, user) return boolSettingDefaultOn(Settings.Secure.DOZE_QUICK_PICKUP_GESTURE, user)
&& !TextUtils.isEmpty(quickPickupSensorType()) && !TextUtils.isEmpty(quickPickupSensorType())
@@ -115,41 +138,41 @@ public class AmbientDisplayConfiguration {
&& !alwaysOnEnabled(user); && !alwaysOnEnabled(user);
} }
/** {@hide} */ /** @hide */
public boolean screenOffUdfpsEnabled(int user) { public boolean screenOffUdfpsEnabled(int user) {
return !TextUtils.isEmpty(udfpsLongPressSensorType()) return !TextUtils.isEmpty(udfpsLongPressSensorType())
&& boolSettingDefaultOff("screen_off_udfps_enabled", user); && boolSettingDefaultOff("screen_off_udfps_enabled", user);
} }
/** {@hide} */ /** @hide */
public boolean wakeScreenGestureAvailable() { public boolean wakeScreenGestureAvailable() {
return mContext.getResources() return mContext.getResources()
.getBoolean(R.bool.config_dozeWakeLockScreenSensorAvailable); .getBoolean(R.bool.config_dozeWakeLockScreenSensorAvailable);
} }
/** {@hide} */ /** @hide */
public boolean wakeLockScreenGestureEnabled(int user) { public boolean wakeLockScreenGestureEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, user) return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, user)
&& wakeScreenGestureAvailable(); && wakeScreenGestureAvailable();
} }
/** {@hide} */ /** @hide */
public boolean wakeDisplayGestureEnabled(int user) { public boolean wakeDisplayGestureEnabled(int user) {
return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, user) return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, user)
&& wakeScreenGestureAvailable(); && wakeScreenGestureAvailable();
} }
/** {@hide} */ /** @hide */
public long getWakeLockScreenDebounce() { public long getWakeLockScreenDebounce() {
return mContext.getResources().getInteger(R.integer.config_dozeWakeLockScreenDebounce); return mContext.getResources().getInteger(R.integer.config_dozeWakeLockScreenDebounce);
} }
/** {@hide} */ /** @hide */
public String doubleTapSensorType() { public String doubleTapSensorType() {
return mContext.getResources().getString(R.string.config_dozeDoubleTapSensorType); return mContext.getResources().getString(R.string.config_dozeDoubleTapSensorType);
} }
/** {@hide} /** @hide
* May support multiple postures. * May support multiple postures.
*/ */
public String[] tapSensorTypeMapping() { public String[] tapSensorTypeMapping() {
@@ -163,22 +186,22 @@ public class AmbientDisplayConfiguration {
return postureMapping; return postureMapping;
} }
/** {@hide} */ /** @hide */
public String longPressSensorType() { public String longPressSensorType() {
return mContext.getResources().getString(R.string.config_dozeLongPressSensorType); return mContext.getResources().getString(R.string.config_dozeLongPressSensorType);
} }
/** {@hide} */ /** @hide */
public String udfpsLongPressSensorType() { public String udfpsLongPressSensorType() {
return mContext.getResources().getString(R.string.config_dozeUdfpsLongPressSensorType); return mContext.getResources().getString(R.string.config_dozeUdfpsLongPressSensorType);
} }
/** {@hide} */ /** @hide */
public String quickPickupSensorType() { public String quickPickupSensorType() {
return mContext.getResources().getString(R.string.config_quickPickupSensorType); return mContext.getResources().getString(R.string.config_quickPickupSensorType);
} }
/** {@hide} */ /** @hide */
public boolean pulseOnLongPressEnabled(int user) { public boolean pulseOnLongPressEnabled(int user) {
return pulseOnLongPressAvailable() && boolSettingDefaultOff( return pulseOnLongPressAvailable() && boolSettingDefaultOff(
Settings.Secure.DOZE_PULSE_ON_LONG_PRESS, user); Settings.Secure.DOZE_PULSE_ON_LONG_PRESS, user);
@@ -191,7 +214,7 @@ public class AmbientDisplayConfiguration {
/** /**
* Returns if Always-on-Display functionality is enabled on the display for a specified user. * Returns if Always-on-Display functionality is enabled on the display for a specified user.
* *
* {@hide} * @hide
*/ */
@TestApi @TestApi
public boolean alwaysOnEnabled(int user) { public boolean alwaysOnEnabled(int user) {
@@ -202,7 +225,7 @@ public class AmbientDisplayConfiguration {
/** /**
* Returns if Always-on-Display functionality is available on the display. * Returns if Always-on-Display functionality is available on the display.
* *
* {@hide} * @hide
*/ */
@TestApi @TestApi
public boolean alwaysOnAvailable() { public boolean alwaysOnAvailable() {
@@ -213,29 +236,29 @@ public class AmbientDisplayConfiguration {
/** /**
* Returns if Always-on-Display functionality is available on the display for a specified user. * Returns if Always-on-Display functionality is available on the display for a specified user.
* *
* {@hide} * @hide
*/ */
@TestApi @TestApi
public boolean alwaysOnAvailableForUser(int user) { public boolean alwaysOnAvailableForUser(int user) {
return alwaysOnAvailable() && !accessibilityInversionEnabled(user); return alwaysOnAvailable() && !accessibilityInversionEnabled(user);
} }
/** {@hide} */ /** @hide */
public String ambientDisplayComponent() { public String ambientDisplayComponent() {
return mContext.getResources().getString(R.string.config_dozeComponent); return mContext.getResources().getString(R.string.config_dozeComponent);
} }
/** {@hide} */ /** @hide */
public boolean accessibilityInversionEnabled(int user) { public boolean accessibilityInversionEnabled(int user) {
return boolSettingDefaultOff(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, user); return boolSettingDefaultOff(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, user);
} }
/** {@hide} */ /** @hide */
public boolean ambientDisplayAvailable() { public boolean ambientDisplayAvailable() {
return !TextUtils.isEmpty(ambientDisplayComponent()); return !TextUtils.isEmpty(ambientDisplayComponent());
} }
/** {@hide} */ /** @hide */
public boolean dozeSuppressed(int user) { public boolean dozeSuppressed(int user) {
return boolSettingDefaultOff(Settings.Secure.SUPPRESS_DOZE, user); return boolSettingDefaultOff(Settings.Secure.SUPPRESS_DOZE, user);
} }
@@ -259,4 +282,52 @@ public class AmbientDisplayConfiguration {
private boolean boolSetting(String name, int user, int def) { private boolean boolSetting(String name, int user, int def) {
return Settings.Secure.getIntForUser(mContext.getContentResolver(), name, def, user) != 0; return Settings.Secure.getIntForUser(mContext.getContentResolver(), name, def, user) != 0;
} }
/** @hide */
@TestApi
public void disableDozeSettings(int userId) {
disableDozeSettings(false /* shouldDisableNonUserConfigurable */, userId);
}
/** @hide */
@TestApi
public void disableDozeSettings(boolean shouldDisableNonUserConfigurable, int userId) {
Map<String, String> initialValues = mUsersInitialValues.get(userId);
if (initialValues != null && !initialValues.isEmpty()) {
throw new IllegalStateException("Don't call #disableDozeSettings more than once,"
+ "without first calling #restoreDozeSettings");
}
initialValues = new ArrayMap<>();
for (String name : DOZE_SETTINGS) {
initialValues.put(name, getDozeSetting(name, userId));
putDozeSetting(name, "0", userId);
}
if (shouldDisableNonUserConfigurable) {
for (String name : NON_USER_CONFIGURABLE_DOZE_SETTINGS) {
initialValues.put(name, getDozeSetting(name, userId));
putDozeSetting(name, "0", userId);
}
}
mUsersInitialValues.put(userId, initialValues);
}
/** @hide */
@TestApi
public void restoreDozeSettings(int userId) {
final Map<String, String> initialValues = mUsersInitialValues.get(userId);
if (initialValues != null && !initialValues.isEmpty()) {
for (String name : DOZE_SETTINGS) {
putDozeSetting(name, initialValues.get(name), userId);
}
mUsersInitialValues.remove(userId);
}
}
private String getDozeSetting(String name, int userId) {
return Settings.Secure.getStringForUser(mContext.getContentResolver(), name, userId);
}
private void putDozeSetting(String name, String value, int userId) {
Settings.Secure.putStringForUser(mContext.getContentResolver(), name, value, userId);
}
} }

19
services/core/java/com/android/server/pm/UserRestrictionsUtils.java
View File

@@ -27,6 +27,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager; import android.content.pm.IPackageManager;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
import android.hardware.display.AmbientDisplayConfiguration;
import android.os.Binder; import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process; import android.os.Process;
@@ -678,21 +679,9 @@ public class UserRestrictionsUtils {
break; break;
case UserManager.DISALLOW_AMBIENT_DISPLAY: case UserManager.DISALLOW_AMBIENT_DISPLAY:
if (newValue) { if (newValue) {
android.provider.Settings.Secure.putIntForUser( final AmbientDisplayConfiguration config =
context.getContentResolver(), new AmbientDisplayConfiguration(context);
Settings.Secure.DOZE_ENABLED, 0, userId); config.disableDozeSettings(userId);
android.provider.Settings.Secure.putIntForUser(
context.getContentResolver(),
Settings.Secure.DOZE_ALWAYS_ON, 0, userId);
android.provider.Settings.Secure.putIntForUser(
context.getContentResolver(),
Settings.Secure.DOZE_PICK_UP_GESTURE, 0, userId);
android.provider.Settings.Secure.putIntForUser(
context.getContentResolver(),
Settings.Secure.DOZE_PULSE_ON_LONG_PRESS, 0, userId);
android.provider.Settings.Secure.putIntForUser(
context.getContentResolver(),
Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, 0, userId);
} }
break; break;
case UserManager.DISALLOW_APPS_CONTROL: case UserManager.DISALLOW_APPS_CONTROL: