Creates new FLAG_APP_INACCESSIBLE flag for DeviceState
Creates new flag to signify a device state that is inaccessible for an application to be launched on. This helps improve CTS testing to make sure we're only testing on device states that make sense. Bug: 230826329 Test: adb shell cmd device_state print-states Change-Id: I21acb936a721af62a4a9a4566246954943f05f67
This commit is contained in:
@@ -18,6 +18,7 @@ package com.android.server.devicestate;
|
||||
|
||||
import static android.hardware.devicestate.DeviceStateManager.MAXIMUM_DEVICE_STATE;
|
||||
import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STATE;
|
||||
import static android.view.Display.DEFAULT_DISPLAY;
|
||||
|
||||
import android.annotation.IntDef;
|
||||
import android.annotation.IntRange;
|
||||
@@ -48,9 +49,16 @@ public final class DeviceState {
|
||||
*/
|
||||
public static final int FLAG_CANCEL_OVERRIDE_REQUESTS = 1 << 0;
|
||||
|
||||
/**
|
||||
* Flag that indicates this device state is inaccessible for applications to be placed in. This
|
||||
* could be a device-state where the {@link DEFAULT_DISPLAY} is not enabled.
|
||||
*/
|
||||
public static final int FLAG_APP_INACCESSIBLE = 1 << 1;
|
||||
|
||||
/** @hide */
|
||||
@IntDef(prefix = {"FLAG_"}, flag = true, value = {
|
||||
FLAG_CANCEL_OVERRIDE_REQUESTS,
|
||||
FLAG_APP_INACCESSIBLE
|
||||
})
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface DeviceStateFlags {}
|
||||
@@ -97,7 +105,8 @@ public final class DeviceState {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "DeviceState{" + "identifier=" + mIdentifier + ", name='" + mName + '\'' + '}';
|
||||
return "DeviceState{" + "identifier=" + mIdentifier + ", name='" + mName + '\''
|
||||
+ ", app_accessible=" + !hasFlag(FLAG_APP_INACCESSIBLE) + "}";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -95,6 +95,7 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
|
||||
private static final String DATA_CONFIG_FILE_PATH = "system/devicestate/";
|
||||
private static final String CONFIG_FILE_NAME = "device_state_configuration.xml";
|
||||
private static final String FLAG_CANCEL_OVERRIDE_REQUESTS = "FLAG_CANCEL_OVERRIDE_REQUESTS";
|
||||
private static final String FLAG_APP_INACCESSIBLE = "FLAG_APP_INACCESSIBLE";
|
||||
|
||||
/** Interface that allows reading the device state configuration. */
|
||||
interface ReadableConfig {
|
||||
@@ -145,6 +146,9 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
|
||||
case FLAG_CANCEL_OVERRIDE_REQUESTS:
|
||||
flags |= DeviceState.FLAG_CANCEL_OVERRIDE_REQUESTS;
|
||||
break;
|
||||
case FLAG_APP_INACCESSIBLE:
|
||||
flags |= DeviceState.FLAG_APP_INACCESSIBLE;
|
||||
break;
|
||||
default:
|
||||
Slog.w(TAG, "Parsed unknown flag with name: "
|
||||
+ configFlagString);
|
||||
|
||||
Reference in New Issue
Block a user