summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Giulio Fiscella <fiscella@google.com> 2022-11-21 14:56:38 +0000
committer Giulio Fiscella <fiscella@google.com> 2022-11-23 00:43:59 +0000
commit33bf687ac1bc2b189513800908d817cacbf2e71a (patch)
tree894cc2e2d07e2a476a1a2df9bdf4fa2bf458d27b
parent7a11a7b0cc53f930963df001d73103bde18b7ba4 (diff)
Add entry group type aliases
Bug: 254631418 Test: atest --no-bazel-mode CtsSafetyCenterTestCases Change-Id: I2445f933a23498a00f4fd3fc9d99e94b2dea56c2
Diffstat
-rw-r--r--SafetyCenter/Config/java/com/android/safetycenter/config/SafetyCenterConfigParser.java12
-rw-r--r--SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigInvalidTest.kt18
-rw-r--r--SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigValidTest.kt24
-rw-r--r--SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_stateful_with_only_issue_only.xml (renamed from SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_rigid_with_only_issue_only.xml)2
-rw-r--r--SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_stateless_with_only_issue_only.xml (renamed from SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_collapsible_with_only_issue_only.xml)2
-rw-r--r--SafetyCenter/Config/tests/res/raw-v34/config_valid.xml24
-rw-r--r--SafetyCenter/ConfigLintChecker/java/android/annotation/SuppressLint.java39
-rw-r--r--framework-s/api/system-current.txt6
-rw-r--r--framework-s/java/android/safetycenter/config/SafetySourcesGroup.java49
-rw-r--r--framework-s/java/android/safetycenter/config/safety_center_config-v34.xsd4
-rw-r--r--service/java/com/android/safetycenter/SafetyCenterConfigReader.java27
-rw-r--r--service/java/com/android/safetycenter/SafetyCenterDataFactory.java4
-rw-r--r--service/java/com/android/safetycenter/SafetyCenterRepository.java4
-rw-r--r--tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt56
-rw-r--r--tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterMultiUsersTest.kt66
-rw-r--r--tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetyCenterConfigTest.kt16
-rw-r--r--tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetySourcesGroupTest.kt244
-rw-r--r--tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt49
18 files changed, 361 insertions, 285 deletions
diff --git a/SafetyCenter/Config/java/com/android/safetycenter/config/SafetyCenterConfigParser.java b/SafetyCenter/Config/java/com/android/safetycenter/config/SafetyCenterConfigParser.java
index 504fcfc3c..e71bf9e74 100644
--- a/SafetyCenter/Config/java/com/android/safetycenter/config/SafetyCenterConfigParser.java
+++ b/SafetyCenter/Config/java/com/android/safetycenter/config/SafetyCenterConfigParser.java
@@ -78,9 +78,9 @@ public final class SafetyCenterConfigParser {
private static final String ATTR_SAFETY_SOURCE_DEDUPLICATION_GROUP = "deduplicationGroup";
private static final String ENUM_STATELESS_ICON_TYPE_NONE = "none";
private static final String ENUM_STATELESS_ICON_TYPE_PRIVACY = "privacy";
- private static final String ENUM_GROUP_TYPE_COLLAPSIBLE = "collapsible";
+ private static final String ENUM_GROUP_TYPE_STATEFUL = "stateful";
+ private static final String ENUM_GROUP_TYPE_STATELESS = "stateless";
private static final String ENUM_GROUP_TYPE_HIDDEN = "hidden";
- private static final String ENUM_GROUP_TYPE_RIGID = "rigid";
private static final String ENUM_PROFILE_PRIMARY = "primary_profile_only";
private static final String ENUM_PROFILE_ALL = "all_profiles";
private static final String ENUM_INITIAL_DISPLAY_STATE_ENABLED = "enabled";
@@ -553,10 +553,10 @@ public final class SafetyCenterConfigParser {
throws ParseException {
String valueToParse = getValueToParse(valueString, parent, name, resources);
switch (valueToParse) {
- case ENUM_GROUP_TYPE_COLLAPSIBLE:
- return SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE;
- case ENUM_GROUP_TYPE_RIGID:
- return SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID;
+ case ENUM_GROUP_TYPE_STATEFUL:
+ return SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL;
+ case ENUM_GROUP_TYPE_STATELESS:
+ return SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS;
case ENUM_GROUP_TYPE_HIDDEN:
return SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_HIDDEN;
default:
diff --git a/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigInvalidTest.kt b/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigInvalidTest.kt
index 3d4ce37d9..84e880384 100644
--- a/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigInvalidTest.kt
+++ b/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigInvalidTest.kt
@@ -229,13 +229,6 @@ class ParserConfigInvalidTest {
"Element safety-sources-config missing",
null),
Params(
- "ConfigSafetySourcesGroupCollapsibleWithOnlyIssueOnly",
- R.raw.config_safety_sources_group_collapsible_with_only_issue_only,
- "Element safety-sources-group invalid",
- "Safety sources groups containing only sources of type issue-only must be of " +
- "type hidden",
- SdkLevel.isAtLeastU()),
- Params(
"ConfigSafetySourcesGroupDuplicateId",
R.raw.config_safety_sources_group_duplicate_id,
"Element safety-sources-config invalid",
@@ -275,8 +268,15 @@ class ParserConfigInvalidTest {
"Element safety-sources-group invalid",
"Required attribute title missing"),
Params(
- "ConfigSafetySourcesGroupRigidWithOnlyIssueOnly",
- R.raw.config_safety_sources_group_rigid_with_only_issue_only,
+ "ConfigSafetySourcesGroupStatefulWithOnlyIssueOnly",
+ R.raw.config_safety_sources_group_stateful_with_only_issue_only,
+ "Element safety-sources-group invalid",
+ "Safety sources groups containing only sources of type issue-only must be of " +
+ "type hidden",
+ SdkLevel.isAtLeastU()),
+ Params(
+ "ConfigSafetySourcesGroupStatelessWithOnlyIssueOnly",
+ R.raw.config_safety_sources_group_stateless_with_only_issue_only,
"Element safety-sources-group invalid",
"Safety sources groups containing only sources of type issue-only must be of " +
"type hidden",
diff --git a/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigValidTest.kt b/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigValidTest.kt
index bd5137cf4..2193e0957 100644
--- a/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigValidTest.kt
+++ b/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigValidTest.kt
@@ -204,12 +204,12 @@ class ParserConfigValidTest {
if (SdkLevel.isAtLeastU()) {
addSafetySourcesGroup(
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- .setId("collapsible_barebone")
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ .setId("stateful_barebone")
.setTitleResId(R.string.reference)
.addSafetySource(
SafetySource.Builder(SafetySource.SAFETY_SOURCE_TYPE_STATIC)
- .setId("collapsible_barebone_source")
+ .setId("stateful_barebone_source")
.setTitleResId(R.string.reference)
.setIntentAction("intent")
.setProfile(SafetySource.PROFILE_PRIMARY)
@@ -217,15 +217,15 @@ class ParserConfigValidTest {
.build())
addSafetySourcesGroup(
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- .setId("collapsible_all_optional")
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ .setId("stateful_all_optional")
.setTitleResId(R.string.reference)
.setSummaryResId(R.string.reference)
.setStatelessIconType(
SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
.addSafetySource(
SafetySource.Builder(SafetySource.SAFETY_SOURCE_TYPE_STATIC)
- .setId("collapsible_all_optional_source")
+ .setId("stateful_all_optional_source")
.setTitleResId(R.string.reference)
.setIntentAction("intent")
.setProfile(SafetySource.PROFILE_PRIMARY)
@@ -233,12 +233,12 @@ class ParserConfigValidTest {
.build())
addSafetySourcesGroup(
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
- .setId("rigid_barebone")
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
+ .setId("stateless_barebone")
.setTitleResId(R.string.reference)
.addSafetySource(
SafetySource.Builder(SafetySource.SAFETY_SOURCE_TYPE_STATIC)
- .setId("rigid_barebone_source")
+ .setId("stateless_barebone_source")
.setTitleResId(R.string.reference)
.setIntentAction("intent")
.setProfile(SafetySource.PROFILE_PRIMARY)
@@ -246,15 +246,15 @@ class ParserConfigValidTest {
.build())
addSafetySourcesGroup(
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
- .setId("rigid_all_optional")
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
+ .setId("stateless_all_optional")
.setTitleResId(R.string.reference)
.setSummaryResId(R.string.reference)
.setStatelessIconType(
SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
.addSafetySource(
SafetySource.Builder(SafetySource.SAFETY_SOURCE_TYPE_STATIC)
- .setId("rigid_all_optional_source")
+ .setId("stateless_all_optional_source")
.setTitleResId(R.string.reference)
.setIntentAction("intent")
.setProfile(SafetySource.PROFILE_PRIMARY)
diff --git a/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_rigid_with_only_issue_only.xml b/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_stateful_with_only_issue_only.xml
index 1d95a55ec..f801ca544 100644
--- a/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_rigid_with_only_issue_only.xml
+++ b/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_stateful_with_only_issue_only.xml
@@ -1,7 +1,7 @@
<safety-center-config>
<safety-sources-config>
<safety-sources-group
- type="rigid"
+ type="stateful"
id="id"
title="@com.android.safetycenter.config.tests:string/reference">
<issue-only-safety-source
diff --git a/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_collapsible_with_only_issue_only.xml b/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_stateless_with_only_issue_only.xml
index effe379f4..9c05e59dd 100644
--- a/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_collapsible_with_only_issue_only.xml
+++ b/SafetyCenter/Config/tests/res/raw-v34/config_safety_sources_group_stateless_with_only_issue_only.xml
@@ -1,7 +1,7 @@
<safety-center-config>
<safety-sources-config>
<safety-sources-group
- type="collapsible"
+ type="stateless"
id="id"
title="@com.android.safetycenter.config.tests:string/reference">
<issue-only-safety-source
diff --git a/SafetyCenter/Config/tests/res/raw-v34/config_valid.xml b/SafetyCenter/Config/tests/res/raw-v34/config_valid.xml
index 5b88dd5e3..1ad57db6f 100644
--- a/SafetyCenter/Config/tests/res/raw-v34/config_valid.xml
+++ b/SafetyCenter/Config/tests/res/raw-v34/config_valid.xml
@@ -119,45 +119,45 @@
profile="primary_profile_only"/>
</safety-sources-group>
<safety-sources-group
- type="collapsible"
- id="collapsible_barebone"
+ type="stateful"
+ id="stateful_barebone"
title="@com.android.safetycenter.config.tests:string/reference">
<static-safety-source
- id="collapsible_barebone_source"
+ id="stateful_barebone_source"
title="@com.android.safetycenter.config.tests:string/reference"
intentAction="intent"
profile="primary_profile_only"/>
</safety-sources-group>
<safety-sources-group
- type="collapsible"
- id="collapsible_all_optional"
+ type="stateful"
+ id="stateful_all_optional"
title="@com.android.safetycenter.config.tests:string/reference"
summary="@com.android.safetycenter.config.tests:string/reference"
statelessIconType="privacy">
<static-safety-source
- id="collapsible_all_optional_source"
+ id="stateful_all_optional_source"
title="@com.android.safetycenter.config.tests:string/reference"
intentAction="intent"
profile="primary_profile_only"/>
</safety-sources-group>
<safety-sources-group
- type="rigid"
- id="rigid_barebone"
+ type="stateless"
+ id="stateless_barebone"
title="@com.android.safetycenter.config.tests:string/reference">
<static-safety-source
- id="rigid_barebone_source"
+ id="stateless_barebone_source"
title="@com.android.safetycenter.config.tests:string/reference"
intentAction="intent"
profile="primary_profile_only"/>
</safety-sources-group>
<safety-sources-group
- type="rigid"
- id="rigid_all_optional"
+ type="stateless"
+ id="stateless_all_optional"
title="@com.android.safetycenter.config.tests:string/reference"
summary="@com.android.safetycenter.config.tests:string/reference"
statelessIconType="privacy">
<static-safety-source
- id="rigid_all_optional_source"
+ id="stateless_all_optional_source"
title="@com.android.safetycenter.config.tests:string/reference"
intentAction="intent"
profile="primary_profile_only"/>
diff --git a/SafetyCenter/ConfigLintChecker/java/android/annotation/SuppressLint.java b/SafetyCenter/ConfigLintChecker/java/android/annotation/SuppressLint.java
new file mode 100644
index 000000000..c6d6dc757
--- /dev/null
+++ b/SafetyCenter/ConfigLintChecker/java/android/annotation/SuppressLint.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.annotation;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Indicates that Lint should ignore the specified warnings for the annotated element. */
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
+@Retention(RetentionPolicy.CLASS)
+public @interface SuppressLint {
+ /**
+ * The set of warnings (identified by the lint issue id) that should be ignored by lint. It is
+ * not an error to specify an unrecognized name.
+ */
+ String[] value();
+}
diff --git a/framework-s/api/system-current.txt b/framework-s/api/system-current.txt
index 9fda15d51..e086b54a8 100644
--- a/framework-s/api/system-current.txt
+++ b/framework-s/api/system-current.txt
@@ -537,9 +537,11 @@ package android.safetycenter.config {
method public int getType();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.safetycenter.config.SafetySourcesGroup> CREATOR;
- field public static final int SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE = 0; // 0x0
+ field @Deprecated public static final int SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE = 0; // 0x0
field public static final int SAFETY_SOURCES_GROUP_TYPE_HIDDEN = 2; // 0x2
- field public static final int SAFETY_SOURCES_GROUP_TYPE_RIGID = 1; // 0x1
+ field @Deprecated public static final int SAFETY_SOURCES_GROUP_TYPE_RIGID = 1; // 0x1
+ field public static final int SAFETY_SOURCES_GROUP_TYPE_STATEFUL = 0; // 0x0
+ field public static final int SAFETY_SOURCES_GROUP_TYPE_STATELESS = 1; // 0x1
field public static final int STATELESS_ICON_TYPE_NONE = 0; // 0x0
field public static final int STATELESS_ICON_TYPE_PRIVACY = 1; // 0x1
}
diff --git a/framework-s/java/android/safetycenter/config/SafetySourcesGroup.java b/framework-s/java/android/safetycenter/config/SafetySourcesGroup.java
index 9e53feac2..0b2542f64 100644
--- a/framework-s/java/android/safetycenter/config/SafetySourcesGroup.java
+++ b/framework-s/java/android/safetycenter/config/SafetySourcesGroup.java
@@ -26,6 +26,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.StringRes;
+import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.content.res.Resources;
import android.os.Parcel;
@@ -53,16 +54,39 @@ public final class SafetySourcesGroup implements Parcelable {
/**
* Indicates that the safety sources group should be displayed as a collapsible group with an
* icon (stateless or stateful) and an optional default summary.
+ *
+ * @deprecated use {@link #SAFETY_SOURCES_GROUP_TYPE_STATEFUL} instead.
*/
public static final int SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE = 0;
/**
+ * Indicates that the safety sources group should be displayed as a group that may contribute to
+ * the overall Safety Center status. This is indicated by a group stateful icon. If all sources
+ * in the group have an unspecified status then a stateless group icon might be applied.
+ */
+ public static final int SAFETY_SOURCES_GROUP_TYPE_STATEFUL =
+ SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE;
+
+ /**
* Indicates that the safety sources group should be displayed as a rigid group with no icon and
* no summary.
+ *
+ * @deprecated use {@link #SAFETY_SOURCES_GROUP_TYPE_STATELESS} instead.
*/
public static final int SAFETY_SOURCES_GROUP_TYPE_RIGID = 1;
- /** Indicates that the safety sources group should not be displayed. */
+ /**
+ * Indicates that the safety sources group should be displayed as a group that does not
+ * contribute to the overall Safety Center status. All sources of type dynamic in the group can
+ * only report an unspecified status. The stateless icon and summary may be ignored and not be
+ * displayed.
+ */
+ public static final int SAFETY_SOURCES_GROUP_TYPE_STATELESS = SAFETY_SOURCES_GROUP_TYPE_RIGID;
+
+ /**
+ * Indicates that the safety sources group should not be displayed. All sources in the group
+ * must be of type issue-only.
+ */
public static final int SAFETY_SOURCES_GROUP_TYPE_HIDDEN = 2;
/**
@@ -70,24 +94,27 @@ public final class SafetySourcesGroup implements Parcelable {
*
* @hide
*/
+ @SuppressLint("UniqueConstants") // Intentionally renaming the COLLAPSIBLE and RIGID constants.
@Retention(RetentionPolicy.SOURCE)
@IntDef(
prefix = "SAFETY_SOURCES_GROUP_TYPE_",
value = {
SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE,
+ SAFETY_SOURCES_GROUP_TYPE_STATEFUL,
SAFETY_SOURCES_GROUP_TYPE_RIGID,
+ SAFETY_SOURCES_GROUP_TYPE_STATELESS,
SAFETY_SOURCES_GROUP_TYPE_HIDDEN
})
public @interface SafetySourceGroupType {}
/**
- * Indicates that the safety sources group will not be displayed with any special icon when all
- * the sources contained in it are stateless.
+ * Indicates that no special icon will be displayed by a safety sources group when all the
+ * sources contained in it are stateless.
*/
public static final int STATELESS_ICON_TYPE_NONE = 0;
/**
- * Indicates that the safety sources group will be displayed with the privacy icon when all the
+ * Indicates that the privacy icon will be displayed by a safety sources group when all the
* sources contained in it are stateless.
*/
public static final int STATELESS_ICON_TYPE_PRIVACY = 1;
@@ -401,12 +428,12 @@ public final class SafetySourcesGroup implements Parcelable {
}
}
- int inferredGroupType = SAFETY_SOURCES_GROUP_TYPE_RIGID;
+ int inferredGroupType = SAFETY_SOURCES_GROUP_TYPE_STATELESS;
if (hasOnlyIssueOnlySources) {
inferredGroupType = SAFETY_SOURCES_GROUP_TYPE_HIDDEN;
} else if (summaryResId != Resources.ID_NULL
|| statelessIconType != Resources.ID_NULL) {
- inferredGroupType = SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE;
+ inferredGroupType = SAFETY_SOURCES_GROUP_TYPE_STATEFUL;
}
int type =
BuilderUtils.validateIntDef(
@@ -415,8 +442,8 @@ public final class SafetySourcesGroup implements Parcelable {
false,
false,
inferredGroupType,
- SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE,
- SAFETY_SOURCES_GROUP_TYPE_RIGID,
+ SAFETY_SOURCES_GROUP_TYPE_STATEFUL,
+ SAFETY_SOURCES_GROUP_TYPE_STATELESS,
SAFETY_SOURCES_GROUP_TYPE_HIDDEN);
if (type == SAFETY_SOURCES_GROUP_TYPE_HIDDEN && !hasOnlyIssueOnlySources) {
throw new IllegalStateException(
@@ -429,11 +456,11 @@ public final class SafetySourcesGroup implements Parcelable {
+ "of type hidden");
}
- boolean isCollapsible = type == SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE;
- boolean isRigid = type == SAFETY_SOURCES_GROUP_TYPE_RIGID;
+ boolean isStateful = type == SAFETY_SOURCES_GROUP_TYPE_STATEFUL;
+ boolean isStateless = type == SAFETY_SOURCES_GROUP_TYPE_STATELESS;
int titleResId =
BuilderUtils.validateResId(
- mTitleResId, "title", isCollapsible || isCollapsible, false);
+ mTitleResId, "title", isStateful || isStateless, false);
return new SafetySourcesGroup(
type, id, titleResId, summaryResId, statelessIconType, safetySources);
diff --git a/framework-s/java/android/safetycenter/config/safety_center_config-v34.xsd b/framework-s/java/android/safetycenter/config/safety_center_config-v34.xsd
index 492cff9ef..b258dbb74 100644
--- a/framework-s/java/android/safetycenter/config/safety_center_config-v34.xsd
+++ b/framework-s/java/android/safetycenter/config/safety_center_config-v34.xsd
@@ -177,8 +177,8 @@
<xsd:simpleType name="groupType">
<xsd:restriction base="xsd:string">
- <xsd:enumeration value="collapsible"/>
- <xsd:enumeration value="rigid"/>
+ <xsd:enumeration value="stateless"/>
+ <xsd:enumeration value="stateful"/>
<xsd:enumeration value="hidden"/>
</xsd:restriction>
</xsd:simpleType>
diff --git a/service/java/com/android/safetycenter/SafetyCenterConfigReader.java b/service/java/com/android/safetycenter/SafetyCenterConfigReader.java
index d09807abb..3064d389a 100644
--- a/service/java/com/android/safetycenter/SafetyCenterConfigReader.java
+++ b/service/java/com/android/safetycenter/SafetyCenterConfigReader.java
@@ -315,14 +315,15 @@ final class SafetyCenterConfigReader {
continue;
}
- boolean hasEntryInRigidGroup =
+ boolean hasEntryInStatelessGroup =
safetySource.getType() == SafetySource.SAFETY_SOURCE_TYPE_DYNAMIC
&& safetySourcesGroup.getType()
- == SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID;
+ == SafetySourcesGroup
+ .SAFETY_SOURCES_GROUP_TYPE_STATELESS;
externalSafetySources.put(
safetySource.getId(),
- new ExternalSafetySource(safetySource, hasEntryInRigidGroup));
+ new ExternalSafetySource(safetySource, hasEntryInStatelessGroup));
}
}
@@ -405,12 +406,12 @@ final class SafetyCenterConfigReader {
/** A wrapper class around a {@link SafetySource} that is providing data externally. */
static final class ExternalSafetySource {
@NonNull private final SafetySource mSafetySource;
- @NonNull private final boolean mHasEntryInRigidGroup;
+ @NonNull private final boolean mHasEntryInStatelessGroup;
private ExternalSafetySource(
- @NonNull SafetySource safetySource, boolean hasEntryInRigidGroup) {
+ @NonNull SafetySource safetySource, boolean hasEntryInStatelessGroup) {
mSafetySource = safetySource;
- mHasEntryInRigidGroup = hasEntryInRigidGroup;
+ mHasEntryInStatelessGroup = hasEntryInStatelessGroup;
}
/** Returns the external {@link SafetySource}. */
@@ -420,11 +421,11 @@ final class SafetyCenterConfigReader {
}
/**
- * Returns whether the external {@link SafetySource} has an entry in a rigid {@link
+ * Returns whether the external {@link SafetySource} has an entry in a stateless {@link
* SafetySourcesGroup}.
*/
- boolean hasEntryInRigidGroup() {
- return mHasEntryInRigidGroup;
+ boolean hasEntryInStatelessGroup() {
+ return mHasEntryInStatelessGroup;
}
@Override
@@ -432,13 +433,13 @@ final class SafetyCenterConfigReader {
if (this == o) return true;
if (!(o instanceof ExternalSafetySource)) return false;
ExternalSafetySource that = (ExternalSafetySource) o;
- return mHasEntryInRigidGroup == that.mHasEntryInRigidGroup
+ return mHasEntryInStatelessGroup == that.mHasEntryInStatelessGroup
&& mSafetySource.equals(that.mSafetySource);
}
@Override
public int hashCode() {
- return Objects.hash(mSafetySource, mHasEntryInRigidGroup);
+ return Objects.hash(mSafetySource, mHasEntryInStatelessGroup);
}
@Override
@@ -446,8 +447,8 @@ final class SafetyCenterConfigReader {
return "ExternalSafetySource{"
+ "mSafetySource="
+ mSafetySource
- + ", mHasEntryInRigidGroup="
- + mHasEntryInRigidGroup
+ + ", mHasEntryInStatelessGroup="
+ + mHasEntryInStatelessGroup
+ '}';
}
}
diff --git a/service/java/com/android/safetycenter/SafetyCenterDataFactory.java b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
index 9225c7d96..4ebb0414a 100644
--- a/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
+++ b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
@@ -167,7 +167,7 @@ final class SafetyCenterDataFactory {
userProfileGroup);
int safetySourcesGroupType = safetySourcesGroup.getType();
switch (safetySourcesGroupType) {
- case SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE:
+ case SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL:
addSafetyCenterEntryGroup(
safetyCenterOverallState,
safetyCenterEntryOrGroups,
@@ -175,7 +175,7 @@ final class SafetyCenterDataFactory {
packageName,
userProfileGroup);
break;
- case SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID:
+ case SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS:
addSafetyCenterStaticEntryGroup(
safetyCenterOverallState,
safetyCenterStaticEntryGroups,
diff --git a/service/java/com/android/safetycenter/SafetyCenterRepository.java b/service/java/com/android/safetycenter/SafetyCenterRepository.java
index c42d849ad..7fb4814fc 100644
--- a/service/java/com/android/safetycenter/SafetyCenterRepository.java
+++ b/service/java/com/android/safetycenter/SafetyCenterRepository.java
@@ -484,12 +484,12 @@ final class SafetyCenterRepository {
if (safetySourceStatus != null) {
int sourceSeverityLevel = safetySourceStatus.getSeverityLevel();
- if (externalSafetySource.hasEntryInRigidGroup()
+ if (externalSafetySource.hasEntryInStatelessGroup()
&& sourceSeverityLevel != SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED) {
throw new IllegalArgumentException(
"Safety source: "
+ safetySourceId
- + " is in a rigid group but specified a severity level: "
+ + " is in a stateless group but specified a severity level: "
+ sourceSeverityLevel);
}
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
index bdbde0f9d..572ea431b 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
@@ -88,15 +88,15 @@ import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_DISABLED_
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_GROUP_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_HIDDEN_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_HIDDEN_WITH_SEARCH_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_IN_COLLAPSIBLE_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_IN_RIGID_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_IN_STATEFUL_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_IN_STATELESS_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_OTHER_PACKAGE_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_ALL_OPTIONAL_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_BAREBONE_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_IN_RIGID_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_IN_STATELESS_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_SOURCE_CONFIG
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_SOURCE_NO_GROUP_TITLE_CONFIG
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.MIXED_COLLAPSIBLE_GROUP_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.MIXED_STATEFUL_GROUP_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.MULTIPLE_SOURCES_CONFIG
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.NO_PAGE_OPEN_CONFIG
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SAMPLE_SOURCE_ID
@@ -113,7 +113,7 @@ import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SOURCE_ID_5
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SOURCE_ID_6
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SOURCE_ID_7
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.STATIC_BAREBONE_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.STATIC_IN_COLLAPSIBLE_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.STATIC_IN_STATEFUL_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SUMMARY_TEST_CONFIG
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SUMMARY_TEST_GROUP_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.getLockScreenSourceConfig
@@ -308,14 +308,14 @@ class SafetyCenterManagerTest {
private val safetyCenterEntryGroupMixedFromComplexConfig =
SafetyCenterEntryOrGroup(
- SafetyCenterEntryGroup.Builder(MIXED_COLLAPSIBLE_GROUP_ID, "OK")
+ SafetyCenterEntryGroup.Builder(MIXED_STATEFUL_GROUP_ID, "OK")
.setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
.setSummary(safetyCenterResourcesContext.getStringByName("group_unknown_summary"))
.setEntries(
listOf(
- safetyCenterCtsData.safetyCenterEntryDefault(DYNAMIC_IN_COLLAPSIBLE_ID),
+ safetyCenterCtsData.safetyCenterEntryDefault(DYNAMIC_IN_STATEFUL_ID),
SafetyCenterEntry.Builder(
- SafetyCenterCtsData.entryId(STATIC_IN_COLLAPSIBLE_ID), "OK")
+ SafetyCenterCtsData.entryId(STATIC_IN_STATEFUL_ID), "OK")
.setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
.setSummary("OK")
.setPendingIntent(safetySourceCtsData.testActivityRedirectPendingIntent)
@@ -549,8 +549,8 @@ class SafetyCenterManagerTest {
safetyCenterCtsData.safetyCenterIssueCritical(ISSUE_ONLY_BAREBONE_ID),
safetyCenterCtsData.safetyCenterIssueRecommendation(DYNAMIC_DISABLED_ID),
safetyCenterCtsData.safetyCenterIssueRecommendation(ISSUE_ONLY_ALL_OPTIONAL_ID),
- safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_RIGID_ID),
- safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_RIGID_ID)),
+ safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_STATELESS_ID),
+ safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_STATELESS_ID)),
listOf(
SafetyCenterEntryOrGroup(
SafetyCenterEntryGroup.Builder(DYNAMIC_GROUP_ID, "OK")
@@ -665,14 +665,14 @@ class SafetyCenterManagerTest {
}
@Test
- fun setSafetySourceData_sourceInRigidGroupUnspecified_setsValue() {
+ fun setSafetySourceData_sourceInStatelessGroupUnspecified_setsValue() {
safetyCenterCtsHelper.setConfig(COMPLEX_CONFIG)
val dataToSet = safetySourceCtsData.unspecified
- safetyCenterCtsHelper.setData(DYNAMIC_IN_RIGID_ID, dataToSet)
+ safetyCenterCtsHelper.setData(DYNAMIC_IN_STATELESS_ID, dataToSet)
val apiSafetySourceData =
- safetyCenterManager.getSafetySourceDataWithPermission(DYNAMIC_IN_RIGID_ID)
+ safetyCenterManager.getSafetySourceDataWithPermission(DYNAMIC_IN_STATELESS_ID)
assertThat(apiSafetySourceData).isEqualTo(dataToSet)
}
@@ -718,19 +718,20 @@ class SafetyCenterManagerTest {
}
@Test
- fun setSafetySourceData_sourceInRigidGroupNotUnspecified_throwsIllegalArgumentException() {
+ fun setSafetySourceData_sourceInStatelessGroupNotUnspecified_throwsIllegalArgumentException() {
safetyCenterCtsHelper.setConfig(COMPLEX_CONFIG)
val thrown =
assertFailsWith(IllegalArgumentException::class) {
- safetyCenterCtsHelper.setData(DYNAMIC_IN_RIGID_ID, safetySourceCtsData.information)
+ safetyCenterCtsHelper.setData(
+ DYNAMIC_IN_STATELESS_ID, safetySourceCtsData.information)
}
assertThat(thrown)
.hasMessageThat()
.isEqualTo(
- "Safety source: $DYNAMIC_IN_RIGID_ID is in a rigid group but specified a severity" +
- " level: ${SafetySourceData.SEVERITY_LEVEL_INFORMATION}")
+ "Safety source: $DYNAMIC_IN_STATELESS_ID is in a stateless group but specified a " +
+ "severity level: $SEVERITY_LEVEL_INFORMATION")
}
@Test
@@ -2247,9 +2248,10 @@ class SafetyCenterManagerTest {
safetyCenterCtsHelper.setData(
ISSUE_ONLY_ALL_OPTIONAL_ID,
SafetySourceCtsData.issuesOnly(safetySourceCtsData.recommendationGeneralIssue))
- safetyCenterCtsHelper.setData(DYNAMIC_IN_RIGID_ID, safetySourceCtsData.unspecifiedWithIssue)
safetyCenterCtsHelper.setData(
- ISSUE_ONLY_IN_RIGID_ID,
+ DYNAMIC_IN_STATELESS_ID, safetySourceCtsData.unspecifiedWithIssue)
+ safetyCenterCtsHelper.setData(
+ ISSUE_ONLY_IN_STATELESS_ID,
SafetySourceCtsData.issuesOnly(safetySourceCtsData.informationIssue))
val apiSafetyCenterData = safetyCenterManager.getSafetyCenterDataWithPermission()
@@ -2289,7 +2291,7 @@ class SafetyCenterManagerTest {
SOURCE_ID_7,
safetySourceCtsData.buildSafetySourceDataWithSummary(
severityLevel = SEVERITY_LEVEL_CRITICAL_WARNING, entrySummary = "critical 2"))
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
@@ -2327,7 +2329,7 @@ class SafetyCenterManagerTest {
safetySourceCtsData.buildSafetySourceDataWithSummary(
severityLevel = SEVERITY_LEVEL_RECOMMENDATION, entrySummary = "recommendation 2"))
// SOURCE_ID_7 leave as an UNKNOWN dynamic entry
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
@@ -2373,7 +2375,7 @@ class SafetyCenterManagerTest {
SOURCE_ID_7,
safetySourceCtsData.buildSafetySourceDataWithSummary(
severityLevel = SEVERITY_LEVEL_UNSPECIFIED, entrySummary = "unspecified 3"))
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
@@ -2416,7 +2418,7 @@ class SafetyCenterManagerTest {
SOURCE_ID_7,
safetySourceCtsData.buildSafetySourceDataWithSummary(
severityLevel = SEVERITY_LEVEL_UNSPECIFIED, entrySummary = "unspecified 4"))
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
@@ -2458,7 +2460,7 @@ class SafetyCenterManagerTest {
SOURCE_ID_7,
safetySourceCtsData.buildSafetySourceDataWithSummary(
severityLevel = SEVERITY_LEVEL_UNSPECIFIED, entrySummary = "unspecified 7"))
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
@@ -2490,7 +2492,7 @@ class SafetyCenterManagerTest {
safetySourceCtsData.buildSafetySourceDataWithSummary(
severityLevel = SEVERITY_LEVEL_INFORMATION, entrySummary = "information"))
// SOURCE_ID_7 leave as an UNKNOWN dynamic entry
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
@@ -2521,7 +2523,7 @@ class SafetyCenterManagerTest {
SOURCE_ID_7,
safetySourceCtsData.buildSafetySourceDataWithSummary(
severityLevel = SEVERITY_LEVEL_INFORMATION, entrySummary = "information"))
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
@@ -2556,7 +2558,7 @@ class SafetyCenterManagerTest {
severityLevel = SEVERITY_LEVEL_UNSPECIFIED,
entrySummary = "unspecified with issue",
withIssue = true))
- // STATIC_IN_COLLAPSIBLE_ID behaves like an UNSPECIFIED dynamic entry
+ // STATIC_IN_STATEFUL_ID behaves like an UNSPECIFIED dynamic entry
val group =
safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterMultiUsersTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterMultiUsersTest.kt
index 9b54e233e..71367f659 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterMultiUsersTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterMultiUsersTest.kt
@@ -43,11 +43,11 @@ import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_BAREBONE_
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_DISABLED_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_GROUP_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_HIDDEN_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_IN_RIGID_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_IN_STATELESS_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_ALL_OPTIONAL_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_ALL_PROFILE_SOURCE_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_BAREBONE_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_IN_RIGID_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_IN_STATELESS_ID
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_SOURCE_ALL_PROFILE_CONFIG
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_SOURCE_CONFIG
import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SINGLE_SOURCE_ALL_PROFILE_CONFIG
@@ -129,8 +129,8 @@ class SafetyCenterMultiUsersTest {
safetyCenterCtsData.safetyCenterIssueRecommendation(DYNAMIC_DISABLED_ID),
safetyCenterCtsData.safetyCenterIssueRecommendation(
ISSUE_ONLY_ALL_OPTIONAL_ID, attributionTitle = null),
- safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_RIGID_ID),
- safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_RIGID_ID))
+ safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_STATELESS_ID),
+ safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_STATELESS_ID))
private val dynamicBareboneDefault =
safetyCenterCtsData.safetyCenterEntryDefault(DYNAMIC_BAREBONE_ID)
@@ -214,19 +214,19 @@ class SafetyCenterMultiUsersTest {
.setEnabled(false)
.build()
- private val rigidEntry =
+ private val staticEntry =
SafetyCenterStaticEntry.Builder("OK")
.setSummary("OK")
.setPendingIntent(safetySourceCtsData.testActivityRedirectPendingIntent)
.build()
- private val rigidEntryUpdated =
+ private val staticEntryUpdated =
SafetyCenterStaticEntry.Builder("Unspecified title")
.setSummary("Unspecified summary")
.setPendingIntent(safetySourceCtsData.testActivityRedirectPendingIntent)
.build()
- private val rigidEntryForWorkBuilder
+ private val staticEntryForWorkBuilder
get() =
SafetyCenterStaticEntry.Builder("Paste")
.setSummary("OK")
@@ -234,18 +234,18 @@ class SafetyCenterMultiUsersTest {
createTestActivityRedirectPendingIntentForUser(
deviceState.workProfile().userHandle()))
- private val rigidEntryForWork
- get() = rigidEntryForWorkBuilder.build()
+ private val staticEntryForWork
+ get() = staticEntryForWorkBuilder.build()
- private val rigidEntryForWorkPaused
+ private val staticEntryForWorkPaused
get() =
- rigidEntryForWorkBuilder
+ staticEntryForWorkBuilder
// TODO(b/233188021): This needs to use the Enterprise API to override the "work"
// keyword.
.setSummary(safetyCenterResourcesContext.getStringByName("work_profile_paused"))
.build()
- private val rigidEntryForWorkUpdated =
+ private val staticEntryForWorkUpdated =
SafetyCenterStaticEntry.Builder("Unspecified title for Work")
.setSummary("Unspecified summary")
.setPendingIntent(safetySourceCtsData.testActivityRedirectPendingIntent)
@@ -405,7 +405,7 @@ class SafetyCenterMultiUsersTest {
staticGroupBuilder
.setEntries(listOf(staticBarebone, staticAllOptional))
.build())),
- listOf(SafetyCenterStaticEntryGroup("OK", listOf(rigidEntry, rigidEntry))))
+ listOf(SafetyCenterStaticEntryGroup("OK", listOf(staticEntry, staticEntry))))
assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
}
@@ -442,7 +442,7 @@ class SafetyCenterMultiUsersTest {
listOf(
SafetyCenterStaticEntryGroup(
"OK",
- listOf(rigidEntry, rigidEntryForWork, rigidEntry, rigidEntryForWork))))
+ listOf(staticEntry, staticEntryForWork, staticEntry, staticEntryForWork))))
assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
}
@@ -480,7 +480,10 @@ class SafetyCenterMultiUsersTest {
SafetyCenterStaticEntryGroup(
"OK",
listOf(
- rigidEntryUpdated, rigidEntryForWork, rigidEntry, rigidEntryForWork))))
+ staticEntryUpdated,
+ staticEntryForWork,
+ staticEntry,
+ staticEntryForWork))))
assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
}
@@ -511,12 +514,12 @@ class SafetyCenterMultiUsersTest {
DYNAMIC_HIDDEN_ID, managedUserId),
safetyCenterCtsData.safetyCenterIssueInformation(
ISSUE_ONLY_ALL_OPTIONAL_ID, managedUserId, attributionTitle = null),
- safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_RIGID_ID),
+ safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_STATELESS_ID),
safetyCenterCtsData.safetyCenterIssueInformation(
- DYNAMIC_IN_RIGID_ID, managedUserId),
- safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_RIGID_ID),
+ DYNAMIC_IN_STATELESS_ID, managedUserId),
+ safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_STATELESS_ID),
safetyCenterCtsData.safetyCenterIssueInformation(
- ISSUE_ONLY_IN_RIGID_ID, managedUserId)),
+ ISSUE_ONLY_IN_STATELESS_ID, managedUserId)),
listOf(
SafetyCenterEntryOrGroup(
SafetyCenterEntryGroup.Builder(DYNAMIC_GROUP_ID, "OK")
@@ -539,10 +542,10 @@ class SafetyCenterMultiUsersTest {
SafetyCenterStaticEntryGroup(
"OK",
listOf(
- rigidEntryUpdated,
- rigidEntryForWorkUpdated,
- rigidEntry,
- rigidEntryForWork))))
+ staticEntryUpdated,
+ staticEntryForWorkUpdated,
+ staticEntry,
+ staticEntryForWork))))
assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
}
@@ -587,10 +590,10 @@ class SafetyCenterMultiUsersTest {
SafetyCenterStaticEntryGroup(
"OK",
listOf(
- rigidEntryUpdated,
- rigidEntryForWorkPaused,
- rigidEntry,
- rigidEntryForWorkPaused))))
+ staticEntryUpdated,
+ staticEntryForWorkPaused,
+ staticEntry,
+ staticEntryForWorkPaused))))
assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
}
@@ -923,9 +926,10 @@ class SafetyCenterMultiUsersTest {
safetyCenterCtsHelper.setData(
ISSUE_ONLY_ALL_OPTIONAL_ID,
SafetySourceCtsData.issuesOnly(safetySourceCtsData.recommendationGeneralIssue))
- safetyCenterCtsHelper.setData(DYNAMIC_IN_RIGID_ID, safetySourceCtsData.unspecifiedWithIssue)
safetyCenterCtsHelper.setData(
- ISSUE_ONLY_IN_RIGID_ID,
+ DYNAMIC_IN_STATELESS_ID, safetySourceCtsData.unspecifiedWithIssue)
+ safetyCenterCtsHelper.setData(
+ ISSUE_ONLY_IN_STATELESS_ID,
SafetySourceCtsData.issuesOnly(safetySourceCtsData.informationIssue))
}
@@ -940,9 +944,9 @@ class SafetyCenterMultiUsersTest {
ISSUE_ONLY_ALL_OPTIONAL_ID,
SafetySourceCtsData.issuesOnly(safetySourceCtsData.informationIssue))
managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
- DYNAMIC_IN_RIGID_ID, safetySourceCtsData.unspecifiedWithIssueForWork)
+ DYNAMIC_IN_STATELESS_ID, safetySourceCtsData.unspecifiedWithIssueForWork)
managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
- ISSUE_ONLY_IN_RIGID_ID,
+ ISSUE_ONLY_IN_STATELESS_ID,
SafetySourceCtsData.issuesOnly(safetySourceCtsData.informationIssue))
}
}
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetyCenterConfigTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetyCenterConfigTest.kt
index 7b0a35311..29d76b59b 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetyCenterConfigTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetyCenterConfigTest.kt
@@ -33,7 +33,7 @@ class SafetyCenterConfigTest {
fun getSafetySourcesGroups_returnsSafetySourcesGroups() {
assertThat(BASE.safetySourcesGroups)
.containsExactly(
- SafetySourcesGroupTest.RIGID_INFERRED, SafetySourcesGroupTest.HIDDEN_INFERRED)
+ SafetySourcesGroupTest.STATELESS_INFERRED, SafetySourcesGroupTest.HIDDEN_INFERRED)
.inOrder()
}
@@ -42,7 +42,7 @@ class SafetyCenterConfigTest {
val sourcesGroups = BASE.safetySourcesGroups
assertFailsWith(UnsupportedOperationException::class) {
- sourcesGroups.add(SafetySourcesGroupTest.COLLAPSIBLE_INFERRED_WITH_SUMMARY)
+ sourcesGroups.add(SafetySourcesGroupTest.STATEFUL_INFERRED_WITH_SUMMARY)
}
}
@@ -50,16 +50,16 @@ class SafetyCenterConfigTest {
fun builder_addSafetySourcesGroup_doesNotMutatePreviouslyBuiltInstance() {
val safetyCenterConfigBuilder =
SafetyCenterConfig.Builder()
- .addSafetySourcesGroup(SafetySourcesGroupTest.RIGID_INFERRED)
+ .addSafetySourcesGroup(SafetySourcesGroupTest.STATELESS_INFERRED)
.addSafetySourcesGroup(SafetySourcesGroupTest.HIDDEN_INFERRED)
val sourceGroups = safetyCenterConfigBuilder.build().safetySourcesGroups
safetyCenterConfigBuilder.addSafetySourcesGroup(
- SafetySourcesGroupTest.COLLAPSIBLE_INFERRED_WITH_SUMMARY)
+ SafetySourcesGroupTest.STATEFUL_INFERRED_WITH_SUMMARY)
assertThat(sourceGroups)
.containsExactly(
- SafetySourcesGroupTest.RIGID_INFERRED, SafetySourcesGroupTest.HIDDEN_INFERRED)
+ SafetySourcesGroupTest.STATELESS_INFERRED, SafetySourcesGroupTest.HIDDEN_INFERRED)
.inOrder()
}
@@ -79,13 +79,13 @@ class SafetyCenterConfigTest {
.addEqualityGroup(
BASE,
SafetyCenterConfig.Builder()
- .addSafetySourcesGroup(SafetySourcesGroupTest.RIGID_INFERRED)
+ .addSafetySourcesGroup(SafetySourcesGroupTest.STATELESS_INFERRED)
.addSafetySourcesGroup(SafetySourcesGroupTest.HIDDEN_INFERRED)
.build())
.addEqualityGroup(
SafetyCenterConfig.Builder()
.addSafetySourcesGroup(SafetySourcesGroupTest.HIDDEN_INFERRED)
- .addSafetySourcesGroup(SafetySourcesGroupTest.RIGID_INFERRED)
+ .addSafetySourcesGroup(SafetySourcesGroupTest.STATELESS_INFERRED)
.build())
.test()
}
@@ -93,7 +93,7 @@ class SafetyCenterConfigTest {
companion object {
private val BASE =
SafetyCenterConfig.Builder()
- .addSafetySourcesGroup(SafetySourcesGroupTest.RIGID_INFERRED)
+ .addSafetySourcesGroup(SafetySourcesGroupTest.STATELESS_INFERRED)
.addSafetySourcesGroup(SafetySourcesGroupTest.HIDDEN_INFERRED)
.build()
}
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetySourcesGroupTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetySourcesGroupTest.kt
index d241e9f4b..28ca90b67 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetySourcesGroupTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/config/SafetySourcesGroupTest.kt
@@ -36,25 +36,25 @@ class SafetySourcesGroupTest {
@Test
fun getType_returnsType() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- assertThat(RIGID_INFERRED.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ assertThat(STATEFUL_INFERRED_WITH_ICON.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ assertThat(STATELESS_INFERRED.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
assertThat(HIDDEN_INFERRED.type)
.isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_HIDDEN)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- assertThat(RIGID_BAREBONE.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
- assertThat(RIGID_ALL_OPTIONAL.type)
- .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
+ assertThat(STATEFUL_BAREBONE.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ assertThat(STATEFUL_ALL_OPTIONAL.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ assertThat(STATELESS_BAREBONE.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
+ assertThat(STATELESS_ALL_OPTIONAL.type)
+ .isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
assertThat(HIDDEN_BAREBONE.type)
.isEqualTo(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_HIDDEN)
assertThat(HIDDEN_ALL_OPTIONAL.type)
@@ -64,17 +64,16 @@ class SafetySourcesGroupTest {
@Test
fun getId_returnsId() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY.id)
- .isEqualTo(COLLAPSIBLE_INFERRED_WITH_SUMMARY_ID)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON.id).isEqualTo(COLLAPSIBLE_INFERRED_WITH_ICON_ID)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH.id).isEqualTo(COLLAPSIBLE_INFERRED_WITH_BOTH_ID)
- assertThat(RIGID_INFERRED.id).isEqualTo(RIGID_INFERRED_ID)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY.id).isEqualTo(STATEFUL_INFERRED_WITH_SUMMARY_ID)
+ assertThat(STATEFUL_INFERRED_WITH_ICON.id).isEqualTo(STATEFUL_INFERRED_WITH_ICON_ID)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH.id).isEqualTo(STATEFUL_INFERRED_WITH_BOTH_ID)
+ assertThat(STATELESS_INFERRED.id).isEqualTo(STATELESS_INFERRED_ID)
assertThat(HIDDEN_INFERRED.id).isEqualTo(HIDDEN_INFERRED_ID)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE.id).isEqualTo(COLLAPSIBLE_BAREBONE_ID)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL.id).isEqualTo(COLLAPSIBLE_ALL_OPTIONAL_ID)
- assertThat(RIGID_BAREBONE.id).isEqualTo(RIGID_BAREBONE_ID)
- assertThat(RIGID_ALL_OPTIONAL.id).isEqualTo(RIGID_ALL_OPTIONAL_ID)
+ assertThat(STATEFUL_BAREBONE.id).isEqualTo(STATEFUL_BAREBONE_ID)
+ assertThat(STATEFUL_ALL_OPTIONAL.id).isEqualTo(STATEFUL_ALL_OPTIONAL_ID)
+ assertThat(STATELESS_BAREBONE.id).isEqualTo(STATELESS_BAREBONE_ID)
+ assertThat(STATELESS_ALL_OPTIONAL.id).isEqualTo(STATELESS_ALL_OPTIONAL_ID)
assertThat(HIDDEN_BAREBONE.id).isEqualTo(HIDDEN_BAREBONE_ID)
assertThat(HIDDEN_ALL_OPTIONAL.id).isEqualTo(HIDDEN_ALL_OPTIONAL_ID)
}
@@ -82,17 +81,17 @@ class SafetySourcesGroupTest {
@Test
fun getTitleResId_returnsTitleResId() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(RIGID_INFERRED.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_INFERRED_WITH_ICON.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATELESS_INFERRED.titleResId).isEqualTo(REFERENCE_RES_ID)
// This is not an enforced invariant, titleResId should just be ignored for hidden groups
assertThat(HIDDEN_INFERRED.titleResId).isEqualTo(Resources.ID_NULL)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(RIGID_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(RIGID_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATELESS_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATELESS_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
assertThat(HIDDEN_BAREBONE.titleResId).isEqualTo(Resources.ID_NULL)
assertThat(HIDDEN_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
}
@@ -100,17 +99,17 @@ class SafetySourcesGroupTest {
@Test
fun getSummaryResId_returnsSummaryResId() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY.summaryResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON.summaryResId).isEqualTo(Resources.ID_NULL)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH.summaryResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(RIGID_INFERRED.summaryResId).isEqualTo(Resources.ID_NULL)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY.summaryResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_INFERRED_WITH_ICON.summaryResId).isEqualTo(Resources.ID_NULL)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH.summaryResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATELESS_INFERRED.summaryResId).isEqualTo(Resources.ID_NULL)
// This is not an enforced invariant, summaryResId should just be ignored for hidden groups
assertThat(HIDDEN_INFERRED.summaryResId).isEqualTo(Resources.ID_NULL)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(RIGID_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
- assertThat(RIGID_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATEFUL_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATELESS_BAREBONE.titleResId).isEqualTo(REFERENCE_RES_ID)
+ assertThat(STATELESS_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
assertThat(HIDDEN_BAREBONE.titleResId).isEqualTo(Resources.ID_NULL)
assertThat(HIDDEN_ALL_OPTIONAL.titleResId).isEqualTo(REFERENCE_RES_ID)
}
@@ -118,26 +117,26 @@ class SafetySourcesGroupTest {
@Test
fun getStatelessIconType_returnsStatelessIconType() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY.statelessIconType)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_NONE)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON.statelessIconType)
+ assertThat(STATEFUL_INFERRED_WITH_ICON.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH.statelessIconType)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
- assertThat(RIGID_INFERRED.statelessIconType)
+ assertThat(STATELESS_INFERRED.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_NONE)
// This is not an enforced invariant
// statelessIconType should just be ignored for hidden groups
assertThat(HIDDEN_INFERRED.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_NONE)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE.statelessIconType)
+ assertThat(STATEFUL_BAREBONE.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_NONE)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL.statelessIconType)
+ assertThat(STATEFUL_ALL_OPTIONAL.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
- assertThat(RIGID_BAREBONE.statelessIconType)
+ assertThat(STATELESS_BAREBONE.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_NONE)
- assertThat(RIGID_ALL_OPTIONAL.statelessIconType)
+ assertThat(STATELESS_ALL_OPTIONAL.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
assertThat(HIDDEN_BAREBONE.statelessIconType)
.isEqualTo(SafetySourcesGroup.STATELESS_ICON_TYPE_NONE)
@@ -148,30 +147,31 @@ class SafetySourcesGroupTest {
@Test
fun getSafetySources_returnsSafetySources() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY.safetySources)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY.safetySources)
.containsExactly(SafetySourceTest.DYNAMIC_BAREBONE)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON.safetySources)
+ assertThat(STATEFUL_INFERRED_WITH_ICON.safetySources)
.containsExactly(SafetySourceTest.STATIC_BAREBONE)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH.safetySources)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH.safetySources)
.containsExactly(
SafetySourceTest.DYNAMIC_BAREBONE,
SafetySourceTest.STATIC_BAREBONE,
SafetySourceTest.ISSUE_ONLY_BAREBONE)
.inOrder()
- assertThat(RIGID_INFERRED.safetySources).containsExactly(SafetySourceTest.STATIC_BAREBONE)
+ assertThat(STATELESS_INFERRED.safetySources)
+ .containsExactly(SafetySourceTest.STATIC_BAREBONE)
assertThat(HIDDEN_INFERRED.safetySources)
.containsExactly(SafetySourceTest.ISSUE_ONLY_BAREBONE)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE.safetySources)
+ assertThat(STATEFUL_BAREBONE.safetySources)
.containsExactly(SafetySourceTest.DYNAMIC_BAREBONE)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL.safetySources)
+ assertThat(STATEFUL_ALL_OPTIONAL.safetySources)
.containsExactly(
SafetySourceTest.DYNAMIC_BAREBONE,
SafetySourceTest.STATIC_BAREBONE,
SafetySourceTest.ISSUE_ONLY_BAREBONE)
- assertThat(RIGID_BAREBONE.safetySources)
+ assertThat(STATELESS_BAREBONE.safetySources)
.containsExactly(SafetySourceTest.STATIC_BAREBONE)
- assertThat(RIGID_ALL_OPTIONAL.safetySources)
+ assertThat(STATELESS_ALL_OPTIONAL.safetySources)
.containsExactly(
SafetySourceTest.DYNAMIC_BAREBONE,
SafetySourceTest.STATIC_BAREBONE,
@@ -185,7 +185,7 @@ class SafetySourcesGroupTest {
@Test
fun getSafetySources_mutationsAreNotAllowed() {
- val sources = COLLAPSIBLE_INFERRED_WITH_SUMMARY.safetySources
+ val sources = STATEFUL_INFERRED_WITH_SUMMARY.safetySources
assertFailsWith(UnsupportedOperationException::class) {
sources.add(SafetySourceTest.DYNAMIC_BAREBONE)
@@ -196,7 +196,7 @@ class SafetySourcesGroupTest {
fun builder_addSafetySource_doesNotMutatePreviouslyBuiltInstance() {
val safetySourcesGroupBuilder =
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_SUMMARY_ID)
+ .setId(STATEFUL_INFERRED_WITH_SUMMARY_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.addSafetySource(SafetySourceTest.DYNAMIC_BAREBONE)
@@ -241,11 +241,11 @@ class SafetySourcesGroupTest {
@Test
@SdkSuppress(minSdkVersion = UPSIDE_DOWN_CAKE, codeName = "UpsideDownCake")
- fun build_collapsibleGroupWithIssueOnlySource_throwsIllegalStateException() {
+ fun build_statefulGroupWithIssueOnlySource_throwsIllegalStateException() {
val builder =
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- .setId(COLLAPSIBLE_BAREBONE_ID)
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ .setId(STATEFUL_BAREBONE_ID)
.setTitleResId(REFERENCE_RES_ID)
.addSafetySource(SafetySourceTest.ISSUE_ONLY_BAREBONE)
@@ -259,11 +259,11 @@ class SafetySourcesGroupTest {
@Test
@SdkSuppress(minSdkVersion = UPSIDE_DOWN_CAKE, codeName = "UpsideDownCake")
- fun build_rigidGroupWithIssueOnlySource_throwsIllegalStateException() {
+ fun build_statelessGroupWithIssueOnlySource_throwsIllegalStateException() {
val builder =
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
- .setId(RIGID_BAREBONE_ID)
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
+ .setId(STATELESS_BAREBONE_ID)
.setTitleResId(REFERENCE_RES_ID)
.addSafetySource(SafetySourceTest.ISSUE_ONLY_BAREBONE)
@@ -277,16 +277,16 @@ class SafetySourcesGroupTest {
@Test
fun describeContents_returns0() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY.describeContents()).isEqualTo(0)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON.describeContents()).isEqualTo(0)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH.describeContents()).isEqualTo(0)
- assertThat(RIGID_INFERRED.describeContents()).isEqualTo(0)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY.describeContents()).isEqualTo(0)
+ assertThat(STATEFUL_INFERRED_WITH_ICON.describeContents()).isEqualTo(0)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH.describeContents()).isEqualTo(0)
+ assertThat(STATELESS_INFERRED.describeContents()).isEqualTo(0)
assertThat(HIDDEN_INFERRED.describeContents()).isEqualTo(0)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE.describeContents()).isEqualTo(0)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL.describeContents()).isEqualTo(0)
- assertThat(RIGID_BAREBONE.describeContents()).isEqualTo(0)
- assertThat(RIGID_ALL_OPTIONAL.describeContents()).isEqualTo(0)
+ assertThat(STATEFUL_BAREBONE.describeContents()).isEqualTo(0)
+ assertThat(STATEFUL_ALL_OPTIONAL.describeContents()).isEqualTo(0)
+ assertThat(STATELESS_BAREBONE.describeContents()).isEqualTo(0)
+ assertThat(STATELESS_ALL_OPTIONAL.describeContents()).isEqualTo(0)
assertThat(HIDDEN_BAREBONE.describeContents()).isEqualTo(0)
assertThat(HIDDEN_ALL_OPTIONAL.describeContents()).isEqualTo(0)
}
@@ -294,16 +294,16 @@ class SafetySourcesGroupTest {
@Test
fun parcelRoundTrip_recreatesEqual() {
- assertThat(COLLAPSIBLE_INFERRED_WITH_SUMMARY).recreatesEqual(SafetySourcesGroup.CREATOR)
- assertThat(COLLAPSIBLE_INFERRED_WITH_ICON).recreatesEqual(SafetySourcesGroup.CREATOR)
- assertThat(COLLAPSIBLE_INFERRED_WITH_BOTH).recreatesEqual(SafetySourcesGroup.CREATOR)
- assertThat(RIGID_INFERRED).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATEFUL_INFERRED_WITH_SUMMARY).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATEFUL_INFERRED_WITH_ICON).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATEFUL_INFERRED_WITH_BOTH).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATELESS_INFERRED).recreatesEqual(SafetySourcesGroup.CREATOR)
assertThat(HIDDEN_INFERRED).recreatesEqual(SafetySourcesGroup.CREATOR)
if (SdkLevel.isAtLeastU()) {
- assertThat(COLLAPSIBLE_BAREBONE).recreatesEqual(SafetySourcesGroup.CREATOR)
- assertThat(COLLAPSIBLE_ALL_OPTIONAL).recreatesEqual(SafetySourcesGroup.CREATOR)
- assertThat(RIGID_BAREBONE).recreatesEqual(SafetySourcesGroup.CREATOR)
- assertThat(RIGID_ALL_OPTIONAL).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATEFUL_BAREBONE).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATEFUL_ALL_OPTIONAL).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATELESS_BAREBONE).recreatesEqual(SafetySourcesGroup.CREATOR)
+ assertThat(STATELESS_ALL_OPTIONAL).recreatesEqual(SafetySourcesGroup.CREATOR)
assertThat(HIDDEN_BAREBONE).recreatesEqual(SafetySourcesGroup.CREATOR)
assertThat(HIDDEN_ALL_OPTIONAL).recreatesEqual(SafetySourcesGroup.CREATOR)
}
@@ -312,13 +312,13 @@ class SafetySourcesGroupTest {
@Test
fun equalsHashCodeToString_usingEqualsHashCodeToStringTester() {
EqualsHashCodeToStringTester()
- .addEqualityGroup(COLLAPSIBLE_INFERRED_WITH_SUMMARY)
- .addEqualityGroup(COLLAPSIBLE_INFERRED_WITH_ICON)
+ .addEqualityGroup(STATEFUL_INFERRED_WITH_SUMMARY)
+ .addEqualityGroup(STATEFUL_INFERRED_WITH_ICON)
.addEqualityGroup(
*mutableListOf(
- COLLAPSIBLE_INFERRED_WITH_BOTH,
+ STATEFUL_INFERRED_WITH_BOTH,
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_BOTH_ID)
+ .setId(STATEFUL_INFERRED_WITH_BOTH_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
@@ -326,11 +326,11 @@ class SafetySourcesGroupTest {
.addSafetySource(SafetySourceTest.STATIC_BAREBONE)
.addSafetySource(SafetySourceTest.ISSUE_ONLY_BAREBONE)
.build())
- .apply { if (SdkLevel.isAtLeastU()) add(COLLAPSIBLE_ALL_OPTIONAL) }
+ .apply { if (SdkLevel.isAtLeastU()) add(STATEFUL_ALL_OPTIONAL) }
.toTypedArray())
.addEqualityGroup(
- *mutableListOf(RIGID_INFERRED)
- .apply { if (SdkLevel.isAtLeastU()) add(RIGID_BAREBONE) }
+ *mutableListOf(STATELESS_INFERRED)
+ .apply { if (SdkLevel.isAtLeastU()) add(STATELESS_BAREBONE) }
.toTypedArray())
.addEqualityGroup(
*mutableListOf(HIDDEN_INFERRED)
@@ -346,7 +346,7 @@ class SafetySourcesGroupTest {
.build())
.addEqualityGroup(
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_BOTH_ID)
+ .setId(STATEFUL_INFERRED_WITH_BOTH_ID)
.setTitleResId(-1)
.setSummaryResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
@@ -354,7 +354,7 @@ class SafetySourcesGroupTest {
.build())
.addEqualityGroup(
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_BOTH_ID)
+ .setId(STATEFUL_INFERRED_WITH_BOTH_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(-1)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
@@ -362,7 +362,7 @@ class SafetySourcesGroupTest {
.build())
.addEqualityGroup(
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_BOTH_ID)
+ .setId(STATEFUL_INFERRED_WITH_BOTH_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_NONE)
@@ -370,7 +370,7 @@ class SafetySourcesGroupTest {
.build())
.addEqualityGroup(
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_BOTH_ID)
+ .setId(STATEFUL_INFERRED_WITH_BOTH_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
@@ -378,8 +378,8 @@ class SafetySourcesGroupTest {
.build())
.apply {
if (SdkLevel.isAtLeastU()) {
- addEqualityGroup(COLLAPSIBLE_BAREBONE)
- addEqualityGroup(RIGID_ALL_OPTIONAL)
+ addEqualityGroup(STATEFUL_BAREBONE)
+ addEqualityGroup(STATELESS_ALL_OPTIONAL)
addEqualityGroup(HIDDEN_ALL_OPTIONAL)
}
}
@@ -389,38 +389,38 @@ class SafetySourcesGroupTest {
companion object {
private const val REFERENCE_RES_ID = 9999
- private const val COLLAPSIBLE_BAREBONE_ID = "collapsible_barebone"
- private const val COLLAPSIBLE_ALL_OPTIONAL_ID = "collapsible_all_optional"
- private const val RIGID_BAREBONE_ID = "rigid_barebone"
- private const val RIGID_ALL_OPTIONAL_ID = "rigid_all_optional"
+ private const val STATEFUL_BAREBONE_ID = "stateful_barebone"
+ private const val STATEFUL_ALL_OPTIONAL_ID = "stateful_all_optional"
+ private const val STATELESS_BAREBONE_ID = "stateless_barebone"
+ private const val STATELESS_ALL_OPTIONAL_ID = "stateless_all_optional"
private const val HIDDEN_BAREBONE_ID = "hidden_barebone"
private const val HIDDEN_ALL_OPTIONAL_ID = "hidden_all_optional"
- private const val COLLAPSIBLE_INFERRED_WITH_SUMMARY_ID = "collapsible_inferred_with_summary"
- private const val COLLAPSIBLE_INFERRED_WITH_ICON_ID = "collapsible_inferred_with_icon"
- private const val COLLAPSIBLE_INFERRED_WITH_BOTH_ID = COLLAPSIBLE_ALL_OPTIONAL_ID
- private const val RIGID_INFERRED_ID = RIGID_BAREBONE_ID
+ private const val STATEFUL_INFERRED_WITH_SUMMARY_ID = "stateful_inferred_with_summary"
+ private const val STATEFUL_INFERRED_WITH_ICON_ID = "stateful_inferred_with_icon"
+ private const val STATEFUL_INFERRED_WITH_BOTH_ID = STATEFUL_ALL_OPTIONAL_ID
+ private const val STATELESS_INFERRED_ID = STATELESS_BAREBONE_ID
private const val HIDDEN_INFERRED_ID = HIDDEN_BAREBONE_ID
// TODO(b/230078826): Consider extracting shared constants to a separate file.
- internal val COLLAPSIBLE_INFERRED_WITH_SUMMARY =
+ internal val STATEFUL_INFERRED_WITH_SUMMARY =
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_SUMMARY_ID)
+ .setId(STATEFUL_INFERRED_WITH_SUMMARY_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.addSafetySource(SafetySourceTest.DYNAMIC_BAREBONE)
.build()
- private val COLLAPSIBLE_INFERRED_WITH_ICON =
+ private val STATEFUL_INFERRED_WITH_ICON =
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_ICON_ID)
+ .setId(STATEFUL_INFERRED_WITH_ICON_ID)
.setTitleResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
.addSafetySource(SafetySourceTest.STATIC_BAREBONE)
.build()
- private val COLLAPSIBLE_INFERRED_WITH_BOTH =
+ private val STATEFUL_INFERRED_WITH_BOTH =
SafetySourcesGroup.Builder()
- .setId(COLLAPSIBLE_INFERRED_WITH_BOTH_ID)
+ .setId(STATEFUL_INFERRED_WITH_BOTH_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
@@ -429,22 +429,22 @@ class SafetySourcesGroupTest {
.addSafetySource(SafetySourceTest.ISSUE_ONLY_BAREBONE)
.build()
- private val COLLAPSIBLE_BAREBONE: SafetySourcesGroup
+ private val STATEFUL_BAREBONE: SafetySourcesGroup
@RequiresApi(UPSIDE_DOWN_CAKE)
get() =
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- .setId(COLLAPSIBLE_BAREBONE_ID)
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ .setId(STATEFUL_BAREBONE_ID)
.setTitleResId(REFERENCE_RES_ID)
.addSafetySource(SafetySourceTest.DYNAMIC_BAREBONE)
.build()
- private val COLLAPSIBLE_ALL_OPTIONAL: SafetySourcesGroup
+ private val STATEFUL_ALL_OPTIONAL: SafetySourcesGroup
@RequiresApi(UPSIDE_DOWN_CAKE)
get() =
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_COLLAPSIBLE)
- .setId(COLLAPSIBLE_ALL_OPTIONAL_ID)
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATEFUL)
+ .setId(STATEFUL_ALL_OPTIONAL_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
@@ -453,29 +453,29 @@ class SafetySourcesGroupTest {
.addSafetySource(SafetySourceTest.ISSUE_ONLY_BAREBONE)
.build()
- internal val RIGID_INFERRED =
+ internal val STATELESS_INFERRED =
SafetySourcesGroup.Builder()
- .setId(RIGID_INFERRED_ID)
+ .setId(STATELESS_INFERRED_ID)
.setTitleResId(REFERENCE_RES_ID)
.addSafetySource(SafetySourceTest.STATIC_BAREBONE)
.build()
- private val RIGID_BAREBONE: SafetySourcesGroup
+ private val STATELESS_BAREBONE: SafetySourcesGroup
@RequiresApi(UPSIDE_DOWN_CAKE)
get() =
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
- .setId(RIGID_BAREBONE_ID)
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
+ .setId(STATELESS_BAREBONE_ID)
.setTitleResId(REFERENCE_RES_ID)
.addSafetySource(SafetySourceTest.STATIC_BAREBONE)
.build()
- private val RIGID_ALL_OPTIONAL: SafetySourcesGroup
+ private val STATELESS_ALL_OPTIONAL: SafetySourcesGroup
@RequiresApi(UPSIDE_DOWN_CAKE)
get() =
SafetySourcesGroup.Builder()
- .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
- .setId(RIGID_ALL_OPTIONAL_ID)
+ .setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
+ .setId(STATELESS_ALL_OPTIONAL_ID)
.setTitleResId(REFERENCE_RES_ID)
.setSummaryResId(REFERENCE_RES_ID)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt
index 56a095ba8..e52e4adf1 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt
@@ -127,7 +127,7 @@ object SafetyCenterCtsConfigs {
/**
* ID of a [SafetySourcesGroup] provided by [SUMMARY_TEST_GROUP_CONFIG], containing sources:
* [SOURCE_ID_1], [SOURCE_ID_2], [SOURCE_ID_3], [SOURCE_ID_4], [SOURCE_ID_5], [SOURCE_ID_6],
- * [SOURCE_ID_7], [STATIC_IN_COLLAPSIBLE_ID].
+ * [SOURCE_ID_7], [STATIC_IN_STATEFUL_ID].
*/
const val SUMMARY_TEST_GROUP_ID = "summary_test_group_id"
@@ -154,15 +154,16 @@ object SafetyCenterCtsConfigs {
/**
* ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG], containing sources:
- * [DYNAMIC_IN_COLLAPSIBLE_ID], [STATIC_IN_COLLAPSIBLE_ID].
+ * [DYNAMIC_IN_STATEFUL_ID], [STATIC_IN_STATEFUL_ID].
*/
- const val MIXED_COLLAPSIBLE_GROUP_ID = "mixed_collapsible"
+ const val MIXED_STATEFUL_GROUP_ID = "mixed_stateful"
/**
* ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG],
- * containing sources: [DYNAMIC_IN_RIGID_ID], [STATIC_IN_RIGID_ID], [ISSUE_ONLY_IN_RIGID_ID].
+ * containing sources: [DYNAMIC_IN_STATELESS_ID], [STATIC_IN_STATELESS_ID],
+ * [ISSUE_ONLY_IN_STATELESS_ID].
*/
- const val MIXED_RIGID_GROUP_ID = "mixed_rigid"
+ const val MIXED_STATELESS_GROUP_ID = "mixed_stateless"
/**
* ID of a source provided by [COMPLEX_CONFIG], [COMPLEX_ALL_PROFILE_CONFIG], and
@@ -234,31 +235,31 @@ object SafetyCenterCtsConfigs {
* ID of a source provided by [COMPLEX_CONFIG], this is a generic, dynamic, primary profile
* only, visible source.
*/
- const val DYNAMIC_IN_COLLAPSIBLE_ID = "dynamic_in_collapsible"
+ const val DYNAMIC_IN_STATEFUL_ID = "dynamic_in_stateful"
/**
* ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is a
* generic, dynamic, visible source.
*/
- const val DYNAMIC_IN_RIGID_ID = "dynamic_in_rigid"
+ const val DYNAMIC_IN_STATELESS_ID = "dynamic_in_stateless"
/**
* ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is an
* issue-only source.
*/
- const val ISSUE_ONLY_IN_RIGID_ID = "issue_only_in_rigid"
+ const val ISSUE_ONLY_IN_STATELESS_ID = "issue_only_in_stateless"
/**
* ID of a source provided by [COMPLEX_CONFIG] and [SUMMARY_TEST_CONFIG], this is a generic,
* static, primary profile only source.
*/
- const val STATIC_IN_COLLAPSIBLE_ID = "static_in_collapsible"
+ const val STATIC_IN_STATEFUL_ID = "static_in_stateful"
/**
* ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is a
* generic, static source.
*/
- const val STATIC_IN_RIGID_ID = "static_in_rigid"
+ const val STATIC_IN_STATELESS_ID = "static_in_stateless"
/** Package name for the [DYNAMIC_OTHER_PACKAGE_ID] source. */
const val OTHER_PACKAGE_NAME = "other_package_name"
@@ -467,7 +468,7 @@ object SafetyCenterCtsConfigs {
SafetyCenterConfig.Builder()
.addSafetySourcesGroup(
safetySourcesGroupBuilder(ANDROID_LOCK_SCREEN_SOURCES_GROUP_ID)
- // This is needed to have a collapsible group with an empty summary
+ // This is needed to have a stateful group with an empty summary
.setSummaryResId(Resources.ID_NULL)
.setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
.addSafetySource(
@@ -501,7 +502,7 @@ object SafetyCenterCtsConfigs {
.addSafetySource(dynamicSafetySource(SOURCE_ID_5))
.addSafetySource(dynamicSafetySource(SOURCE_ID_6))
.addSafetySource(dynamicSafetySource(SOURCE_ID_7))
- .addSafetySource(staticSafetySource(STATIC_IN_COLLAPSIBLE_ID))
+ .addSafetySource(staticSafetySource(STATIC_IN_STATEFUL_ID))
.build())
.build()
@@ -555,7 +556,7 @@ object SafetyCenterCtsConfigs {
safetySourcesGroupBuilder(STATIC_GROUP_ID)
.apply {
if (SdkLevel.isAtLeastU()) {
- setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_RIGID)
+ setType(SafetySourcesGroup.SAFETY_SOURCES_GROUP_TYPE_STATELESS)
setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
} else {
setSummaryResId(Resources.ID_NULL)
@@ -598,16 +599,16 @@ object SafetyCenterCtsConfigs {
.build())
.build())
.addSafetySourcesGroup(
- safetySourcesGroupBuilder(MIXED_COLLAPSIBLE_GROUP_ID)
- .addSafetySource(dynamicSafetySource(DYNAMIC_IN_COLLAPSIBLE_ID))
- .addSafetySource(staticSafetySource(STATIC_IN_COLLAPSIBLE_ID))
+ safetySourcesGroupBuilder(MIXED_STATEFUL_GROUP_ID)
+ .addSafetySource(dynamicSafetySource(DYNAMIC_IN_STATEFUL_ID))
+ .addSafetySource(staticSafetySource(STATIC_IN_STATEFUL_ID))
.build())
.addSafetySourcesGroup(
- safetySourcesGroupBuilder(MIXED_RIGID_GROUP_ID)
+ safetySourcesGroupBuilder(MIXED_STATELESS_GROUP_ID)
.setSummaryResId(Resources.ID_NULL)
- .addSafetySource(dynamicSafetySource(DYNAMIC_IN_RIGID_ID))
- .addSafetySource(staticSafetySource(STATIC_IN_RIGID_ID))
- .addSafetySource(issueOnlySafetySource(ISSUE_ONLY_IN_RIGID_ID))
+ .addSafetySource(dynamicSafetySource(DYNAMIC_IN_STATELESS_ID))
+ .addSafetySource(staticSafetySource(STATIC_IN_STATELESS_ID))
+ .addSafetySource(issueOnlySafetySource(ISSUE_ONLY_IN_STATELESS_ID))
.build())
.build()
@@ -669,14 +670,14 @@ object SafetyCenterCtsConfigs {
.build())
.build())
.addSafetySourcesGroup(
- safetySourcesGroupBuilder(MIXED_RIGID_GROUP_ID)
+ safetySourcesGroupBuilder(MIXED_STATELESS_GROUP_ID)
.setSummaryResId(Resources.ID_NULL)
.addSafetySource(
- dynamicAllProfileSafetySourceBuilder(DYNAMIC_IN_RIGID_ID).build())
+ dynamicAllProfileSafetySourceBuilder(DYNAMIC_IN_STATELESS_ID).build())
.addSafetySource(
- staticAllProfileSafetySourceBuilder(STATIC_IN_RIGID_ID).build())
+ staticAllProfileSafetySourceBuilder(STATIC_IN_STATELESS_ID).build())
.addSafetySource(
- issueOnlyAllProfileSafetySourceBuilder(ISSUE_ONLY_IN_RIGID_ID).build())
+ issueOnlyAllProfileSafetySourceBuilder(ISSUE_ONLY_IN_STATELESS_ID).build())
.build())
.build()
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-23 11:29:47 +0000