Commit d8cf049d authored May 09, 2023 by Jiaming Liu Committed by Automerger Merge Worker May 09, 2023

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 am: 6bccc8b0

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

Change-Id: Idfae9c62030eb6b6de333091565db0ab5377b0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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