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

Commit dd6a0864 authored by Kenneth Ford's avatar Kenneth Ford Committed by Android (Google) Code Review
Browse files

Merge "Adds back hasFlag check for DeviceState toString method" into 24D1-dev

parents dc331544 62747e4d

core/java/android/hardware/devicestate/DeviceState.java

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

    @Override

    public String toString() {

    public String toString() {

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

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

                + ", app_accessible=" + !hasProperty(PROPERTY_APP_INACCESSIBLE)

                + ", app_accessible=" + !(hasProperty(PROPERTY_APP_INACCESSIBLE)

                + ", cancel_when_requester_not_on_top="

                || hasFlag(FLAG_APP_INACCESSIBLE)) + ", cancel_when_requester_not_on_top="

                + hasProperty(PROPERTY_POLICY_CANCEL_WHEN_REQUESTER_NOT_ON_TOP)

                + (hasProperty(PROPERTY_POLICY_CANCEL_WHEN_REQUESTER_NOT_ON_TOP)

                + "}";

                || hasFlag(FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP)) + "}";

    }

    }





    @Override

    @Override