diff --git a/networksecurity/tests/test-apps/AndroidManifest.xml b/networksecurity/tests/test-apps/AndroidManifest.xml
index 276eb0fa31..dcd18f501b 100644
--- a/networksecurity/tests/test-apps/AndroidManifest.xml
+++ b/networksecurity/tests/test-apps/AndroidManifest.xml
@@ -24,8 +24,7 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
-        tools:targetApi="34">
+        android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
         <profileable android:shell="true" />
         <activity
             android:name=".MainActivity"
diff --git a/networksecurity/tests/test-apps/res/layout/activity_main.xml b/networksecurity/tests/test-apps/res/layout/activity_main.xml
index 513af95b3a..f1af782e02 100644
--- a/networksecurity/tests/test-apps/res/layout/activity_main.xml
+++ b/networksecurity/tests/test-apps/res/layout/activity_main.xml
@@ -48,6 +48,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Connect to no-sct.badssl.com" />
+    <Button
+        android:id="@+id/button_check_log_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Check log list" />
     <TextView
         android:id="@+id/textView"
         android:layout_width="match_parent"
diff --git a/networksecurity/tests/test-apps/src/com/android/ctdemo/MainActivity.java b/networksecurity/tests/test-apps/src/com/android/ctdemo/MainActivity.java
index 56b56fa31d..91cdded642 100644
--- a/networksecurity/tests/test-apps/src/com/android/ctdemo/MainActivity.java
+++ b/networksecurity/tests/test-apps/src/com/android/ctdemo/MainActivity.java
@@ -31,6 +31,9 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -98,6 +101,33 @@ public class MainActivity extends AppCompatActivity {
         urlConnection.disconnect();
     }
 
+    private void checkLogList(TextView textView) {
+        StringBuilder builder = new StringBuilder();
+        Path root = Paths.get("/data/misc/keychain/ct/");
+        try {
+            for (Path version : Files.newDirectoryStream(root, "v*")) {
+                if (Files.isDirectory(version)) {
+                    for (Path dir : Files.newDirectoryStream(version)) {
+                        if (!dir.endsWith("current")) {
+                            builder.append(dir.toString() + "\n");
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            builder = new StringBuilder();
+            builder.append(e.toString());
+        }
+        final String text = builder.toString();
+        handler.post(
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        textView.setText(text);
+                    }
+                });
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -107,6 +137,7 @@ public class MainActivity extends AppCompatActivity {
         Button buttonWikipedia = (Button) findViewById(R.id.button_wikipedia);
         Button buttonValid = (Button) findViewById(R.id.button_valid_badssl);
         Button buttonNoSCT = (Button) findViewById(R.id.button_no_sct_badssl);
+        Button buttonCheckLogList = (Button) findViewById(R.id.button_check_log_list);
         final TextView textView = (TextView) findViewById(R.id.textView);
         buttonWikipedia.setOnClickListener(
                 new View.OnClickListener() {
@@ -144,5 +175,17 @@ public class MainActivity extends AppCompatActivity {
                                 });
                     }
                 });
+        buttonCheckLogList.setOnClickListener(
+                new View.OnClickListener() {
+                    public void onClick(View v) {
+                        executor.execute(
+                                new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        checkLogList(textView);
+                                    }
+                                });
+                    }
+                });
     }
 }