Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3dbbfd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Creates new FLAG_APP_INACCESSIBLE flag for DeviceState" into tm-dev am: 03d89f9e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351213



Change-Id: Ia57251856e22f4ff44a627ff1ed82ad4b8db7fad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8616e8b 03d89f9e

services/core/java/com/android/server/devicestate/DeviceState.java

+10 −1
Original line number Diff line number Diff line
@@ -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

services/core/java/com/android/server/policy/DeviceStateProviderImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -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);