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

Commit f895e3b9 authored by Jiaming Liu's avatar Jiaming Liu Committed by Automerger Merge Worker
Browse files

Merge "Add cancel_when_requester_not_on_top to device_state print-states... 

Merge "Add cancel_when_requester_not_on_top to device_state print-states output" into udc-dev am: bad895ec

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



Change-Id: If29dfde420150d116c7c137ba48391e4db4319d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bda6108e bad895ec

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

+4 −1
Original line number Diff line number Diff line
@@ -139,7 +139,10 @@ public final class DeviceState { 
    @Override

    public String toString() {

        return "DeviceState{" + "identifier=" + mIdentifier + ", name='" + mName + '\''

                + ", app_accessible=" + !hasFlag(FLAG_APP_INACCESSIBLE) + "}";

                + ", app_accessible=" + !hasFlag(FLAG_APP_INACCESSIBLE)

                + ", cancel_when_requester_not_on_top="

                + hasFlag(FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP)

                + "}";

    }



    @Override