commit bd0eb0dd319a848b785b58925fd0a78f46acfa23
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Dec 11 22:05:12 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 11 22:05:12 2023 +0000
tree 4e59d4e90e92cc529984377e58ed4f1fd2c563bb
parent d1f24c845cfbc5541f8dc70bbecfe7deb75e4278
parent 242ae4fbcc7898c6d8afc2a163c545df9ef2e006

Merge "Lock Private space at the end of PS setup." into main

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9722a85..8278978 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -37,6 +37,10 @@
     },
     {
       "name": "SettingsPerfTests"
+    },
+    {
+      "name": "SettingsScreenshotRNGTests",
+      "host": true
     }
   ]
 }

src/com/android/settings/development/GrammaticalGenderPreferenceController.java

diff --git a/src/com/android/settings/development/GrammaticalGenderPreferenceController.java b/src/com/android/settings/development/GrammaticalGenderPreferenceController.java
index 7b8ec65..0540974 100644
--- a/src/com/android/settings/development/GrammaticalGenderPreferenceController.java
+++ b/src/com/android/settings/development/GrammaticalGenderPreferenceController.java
@@ -95,4 +95,9 @@
         listPreference.setValue(mListValues[index]);
         listPreference.setSummary(mListSummaries[index]);
     }
+
+    @Override
+    public boolean isAvailable() {
+        return android.app.Flags.systemTermsOfAddressEnabled();
+    }
 }