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

Commit abc6d425 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "SCREENSHOT_DETECTION -> teamfood" into tm-qpr-dev am: 9414e050 

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



Change-Id: I7a2242cf71aad11c195363adf2f5478176586440
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3179337 9414e050

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -512,7 +512,8 @@ object Flags { 
    @JvmField val SCREENSHOT_METADATA = unreleasedFlag(1302, "screenshot_metadata", teamfood = true)

    @JvmField val SCREENSHOT_METADATA = unreleasedFlag(1302, "screenshot_metadata", teamfood = true)





    // TODO(b/266955521): Tracking bug

    // TODO(b/266955521): Tracking bug

    @JvmField val SCREENSHOT_DETECTION = unreleasedFlag(1303, "screenshot_detection")

    @JvmField

    val SCREENSHOT_DETECTION = unreleasedFlag(1303, "screenshot_detection", teamfood = true)





    // 1400 - columbus

    // 1400 - columbus

    // TODO(b/254512756): Tracking Bug

    // TODO(b/254512756): Tracking Bug