From 1037f3dc47fc59e238760ba0177c97fc7c64b62c Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Fri, 30 Jun 2023 11:23:27 -0700
Subject: [PATCH] Add direct usage of Flags in demo app

So that flags aren't subject to optimization

Bug: 289449667
Test: atest FlagStateComboTests
Change-Id: Idafa571e74448fad3ae3d36c1e00a960abb21f24
---
 .../android/aconfig/demo/AconfigDemoActivity.java   | 13 ++++++++++++-
 samples/AconfigDemo/tests/Android.bp                |  1 -
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/samples/AconfigDemo/src/com/example/android/aconfig/demo/AconfigDemoActivity.java b/samples/AconfigDemo/src/com/example/android/aconfig/demo/AconfigDemoActivity.java
index 0f96370d2..ed0d683fa 100644
--- a/samples/AconfigDemo/src/com/example/android/aconfig/demo/AconfigDemoActivity.java
+++ b/samples/AconfigDemo/src/com/example/android/aconfig/demo/AconfigDemoActivity.java
@@ -18,9 +18,12 @@ package com.example.android.aconfig.demo;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
-import android.widget.TextView;
 import android.view.WindowManager;
+import android.widget.TextView;
+
+import com.example.android.aconfig.demo.flags.Flags;
 
 import javax.inject.Inject;
 
@@ -46,6 +49,14 @@ public class AconfigDemoActivity extends Activity {
         simpleTextView.append(cp.getContent());
 
         simpleTextView.append(injectedContent.getContent());
+
+        if (Flags.awesomeFlag1()) {
+            Log.v("AconfigDemoActivity", Flags.FLAG_AWESOME_FLAG_1 + " is on!");
+        }
+
+        if (Flags.awesomeFlag2()) {
+            Log.v("AconfigDemoActivity", Flags.FLAG_AWESOME_FLAG_2 + " is on!");
+        }
     }
 }
 
diff --git a/samples/AconfigDemo/tests/Android.bp b/samples/AconfigDemo/tests/Android.bp
index 9aea52608..5034643d3 100644
--- a/samples/AconfigDemo/tests/Android.bp
+++ b/samples/AconfigDemo/tests/Android.bp
@@ -7,7 +7,6 @@ android_test {
     srcs: ["src/**/*.java"],
     certificate: "platform",
     static_libs: [
-        "ContentLibs",
         "junit",
         "mockito-target-minus-junit4",
         "androidx.test.runner",