Rename NONE to UNSPECIFIED for EntrySeverityLevel.

Bug: 220367542
Test: atest CtsSafetyCenterTestCases
Change-Id: Ia397636bfe039bf9fe96b7368a1058a448796395
Merged-In: Ia397636bfe039bf9fe96b7368a1058a448796395

7 files changed, 103 insertions, 93 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyEntryPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyEntryPreference.java
index dc452ebd7..bdedc46f2 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyEntryPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyEntryPreference.java
@@ -47,7 +47,7 @@ public class SafetyEntryPreference extends Preference {
         switch (entrySeverityLevel) {
             case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN:
                 return SeverityLevel.SEVERITY_LEVEL_UNKNOWN;
-            case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_NONE:
+            case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED:
                 return SeverityLevel.NONE;
             case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_OK:
                 return SeverityLevel.INFORMATION;
diff --git a/framework-s/api/system-current.txt b/framework-s/api/system-current.txt
index eb62303be..23de4e414 100644
--- a/framework-s/api/system-current.txt
+++ b/framework-s/api/system-current.txt
@@ -62,20 +62,20 @@ package android.safetycenter {
     method @NonNull public String getId();
     method @NonNull public android.app.PendingIntent getPendingIntent();
     method public int getSeverityLevel();
-    method public int getSeverityNoneIconType();
+    method public int getSeverityUnspecifiedIconType();
     method @Nullable public CharSequence getSummary();
     method @NonNull public CharSequence getTitle();
     method public boolean isEnabled();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.safetycenter.SafetyCenterEntry> CREATOR;
     field public static final int ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING = 3400; // 0xd48
-    field public static final int ENTRY_SEVERITY_LEVEL_NONE = 3100; // 0xc1c
     field public static final int ENTRY_SEVERITY_LEVEL_OK = 3200; // 0xc80
     field public static final int ENTRY_SEVERITY_LEVEL_RECOMMENDATION = 3300; // 0xce4
     field public static final int ENTRY_SEVERITY_LEVEL_UNKNOWN = 3000; // 0xbb8
-    field public static final int SEVERITY_NONE_ICON_TYPE_NO_ICON = 0; // 0x0
-    field public static final int SEVERITY_NONE_ICON_TYPE_NO_RECOMMENDATION = 2; // 0x2
-    field public static final int SEVERITY_NONE_ICON_TYPE_PRIVACY = 1; // 0x1
+    field public static final int ENTRY_SEVERITY_LEVEL_UNSPECIFIED = 3100; // 0xc1c
+    field public static final int SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON = 0; // 0x0
+    field public static final int SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION = 2; // 0x2
+    field public static final int SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY = 1; // 0x1
   }
 
   public static final class SafetyCenterEntry.Builder {
@@ -88,7 +88,7 @@ package android.safetycenter {
     method @NonNull public android.safetycenter.SafetyCenterEntry.Builder setId(@NonNull String);
     method @NonNull public android.safetycenter.SafetyCenterEntry.Builder setPendingIntent(@NonNull android.app.PendingIntent);
     method @NonNull public android.safetycenter.SafetyCenterEntry.Builder setSeverityLevel(int);
-    method @NonNull public android.safetycenter.SafetyCenterEntry.Builder setSeverityNoneIconType(int);
+    method @NonNull public android.safetycenter.SafetyCenterEntry.Builder setSeverityUnspecifiedIconType(int);
     method @NonNull public android.safetycenter.SafetyCenterEntry.Builder setSummary(@Nullable CharSequence);
     method @NonNull public android.safetycenter.SafetyCenterEntry.Builder setTitle(@NonNull CharSequence);
   }
@@ -109,7 +109,7 @@ package android.safetycenter {
     method @NonNull public java.util.List<android.safetycenter.SafetyCenterEntry> getEntries();
     method @NonNull public String getId();
     method public int getSeverityLevel();
-    method public int getSeverityNoneIconType();
+    method public int getSeverityUnspecifiedIconType();
     method @Nullable public CharSequence getSummary();
     method @NonNull public CharSequence getTitle();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
@@ -123,7 +123,7 @@ package android.safetycenter {
     method @NonNull public android.safetycenter.SafetyCenterEntryGroup.Builder setEntries(@NonNull java.util.List<android.safetycenter.SafetyCenterEntry>);
     method @NonNull public android.safetycenter.SafetyCenterEntryGroup.Builder setId(@NonNull String);
     method @NonNull public android.safetycenter.SafetyCenterEntryGroup.Builder setSeverityLevel(int);
-    method @NonNull public android.safetycenter.SafetyCenterEntryGroup.Builder setSeverityNoneIconType(int);
+    method @NonNull public android.safetycenter.SafetyCenterEntryGroup.Builder setSeverityUnspecifiedIconType(int);
     method @NonNull public android.safetycenter.SafetyCenterEntryGroup.Builder setSummary(@Nullable CharSequence);
     method @NonNull public android.safetycenter.SafetyCenterEntryGroup.Builder setTitle(@NonNull CharSequence);
   }
diff --git a/framework-s/java/android/safetycenter/SafetyCenterEntry.java b/framework-s/java/android/safetycenter/SafetyCenterEntry.java
index 0d92679e6..33c790289 100644
--- a/framework-s/java/android/safetycenter/SafetyCenterEntry.java
+++ b/framework-s/java/android/safetycenter/SafetyCenterEntry.java
@@ -62,7 +62,7 @@ public final class SafetyCenterEntry implements Parcelable {
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(prefix = "ENTRY_SEVERITY_LEVEL_", value = {
             ENTRY_SEVERITY_LEVEL_UNKNOWN,
-            ENTRY_SEVERITY_LEVEL_NONE,
+            ENTRY_SEVERITY_LEVEL_UNSPECIFIED,
             ENTRY_SEVERITY_LEVEL_OK,
             ENTRY_SEVERITY_LEVEL_RECOMMENDATION,
             ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING,
@@ -83,7 +83,7 @@ public final class SafetyCenterEntry implements Parcelable {
      * a security setting isn't configured but it's not considered a risk, or for privacy-related
      * entries).
      */
-    public static final int ENTRY_SEVERITY_LEVEL_NONE = 3100;
+    public static final int ENTRY_SEVERITY_LEVEL_UNSPECIFIED = 3100;
 
     /** Indicates that there are no problems present with this entry. */
     public static final int ENTRY_SEVERITY_LEVEL_OK = 3200;
@@ -96,35 +96,36 @@ public final class SafetyCenterEntry implements Parcelable {
 
     /**
      * All possible icon types for a {@link SafetyCenterEntry} to use when its severity level is
-     * {@link #ENTRY_SEVERITY_LEVEL_NONE}.
+     * {@link #ENTRY_SEVERITY_LEVEL_UNSPECIFIED}.
      *
-     * <p>It is only relevant when the entry's severity level is {@link #ENTRY_SEVERITY_LEVEL_NONE}.
+     * <p>It is only relevant when the entry's severity level is {@link
+     * #ENTRY_SEVERITY_LEVEL_UNSPECIFIED}.
      *
      * @hide
      */
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef(prefix = "SEVERITY_NONE_ICON_TYPE_", value = {
-            SEVERITY_NONE_ICON_TYPE_NO_ICON,
-            SEVERITY_NONE_ICON_TYPE_PRIVACY,
-            SEVERITY_NONE_ICON_TYPE_NO_RECOMMENDATION,
+    @IntDef(prefix = "SEVERITY_UNSPECIFIED_ICON_TYPE_", value = {
+            SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON,
+            SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY,
+            SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION,
     })
-    public @interface SeverityNoneIconType {
+    public @interface SeverityUnspecifiedIconType {
     }
 
-    /** Indicates an entry with {@link #ENTRY_SEVERITY_LEVEL_NONE} should not use an icon. */
-    public static final int SEVERITY_NONE_ICON_TYPE_NO_ICON = 0;
+    /** Indicates an entry with {@link #ENTRY_SEVERITY_LEVEL_UNSPECIFIED} should not use an icon. */
+    public static final int SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON = 0;
 
     /**
-     * Indicates an entry with {@link #ENTRY_SEVERITY_LEVEL_NONE} should use the privacy icon, for
-     * privacy features.
+     * Indicates an entry with {@link #ENTRY_SEVERITY_LEVEL_UNSPECIFIED} should use the privacy
+     * icon, for privacy features.
      */
-    public static final int SEVERITY_NONE_ICON_TYPE_PRIVACY = 1;
+    public static final int SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY = 1;
 
     /**
-     * Indicates an entry with {@link #ENTRY_SEVERITY_LEVEL_NONE} should use an icon indicating it
-     * has no current recommendation or is missing data to provide one.
+     * Indicates an entry with {@link #ENTRY_SEVERITY_LEVEL_UNSPECIFIED} should use an icon
+     * indicating it has no current recommendation.
      */
-    public static final int SEVERITY_NONE_ICON_TYPE_NO_RECOMMENDATION = 2;
+    public static final int SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION = 2;
 
 
     @NonNull
@@ -135,8 +136,8 @@ public final class SafetyCenterEntry implements Parcelable {
     private final CharSequence mSummary;
     @EntrySeverityLevel
     private final int mSeverityLevel;
-    @SeverityNoneIconType
-    private final int mSeverityNoneIconType;
+    @SeverityUnspecifiedIconType
+    private final int mSeverityUnspecifiedIconType;
     private final boolean mEnabled;
     @NonNull
     private final PendingIntent mPendingIntent;
@@ -148,7 +149,7 @@ public final class SafetyCenterEntry implements Parcelable {
             @NonNull CharSequence title,
             @Nullable CharSequence summary,
             @EntrySeverityLevel int severityLevel,
-            @SeverityNoneIconType int severityNoneIconType,
+            @SeverityUnspecifiedIconType int severityUnspecifiedIconType,
             boolean enabled,
             @NonNull PendingIntent pendingIntent,
             @Nullable IconAction iconAction) {
@@ -156,7 +157,7 @@ public final class SafetyCenterEntry implements Parcelable {
         mTitle = requireNonNull(title);
         mSummary = summary;
         mSeverityLevel = severityLevel;
-        mSeverityNoneIconType = severityNoneIconType;
+        mSeverityUnspecifiedIconType = severityUnspecifiedIconType;
         mEnabled = enabled;
         mPendingIntent = requireNonNull(pendingIntent);
         mIconAction = iconAction;
@@ -189,10 +190,10 @@ public final class SafetyCenterEntry implements Parcelable {
         return mSeverityLevel;
     }
 
-    /** Returns the {@link SeverityNoneIconType} of this entry. */
-    @SeverityNoneIconType
-    public int getSeverityNoneIconType() {
-        return mSeverityNoneIconType;
+    /** Returns the {@link SeverityUnspecifiedIconType} of this entry. */
+    @SeverityUnspecifiedIconType
+    public int getSeverityUnspecifiedIconType() {
+        return mSeverityUnspecifiedIconType;
     }
 
     /** Returns whether or not this entry is enabled. */
@@ -221,7 +222,7 @@ public final class SafetyCenterEntry implements Parcelable {
         if (o == null || getClass() != o.getClass()) return false;
         SafetyCenterEntry that = (SafetyCenterEntry) o;
         return mSeverityLevel == that.mSeverityLevel
-                && mSeverityNoneIconType == that.mSeverityNoneIconType
+                && mSeverityUnspecifiedIconType == that.mSeverityUnspecifiedIconType
                 && mEnabled == that.mEnabled
                 && Objects.equals(mId, that.mId)
                 && TextUtils.equals(mTitle, that.mTitle)
@@ -232,8 +233,8 @@ public final class SafetyCenterEntry implements Parcelable {
 
     @Override
     public int hashCode() {
-        return Objects.hash(mId, mTitle, mSummary, mSeverityLevel, mSeverityNoneIconType, mEnabled,
-                mPendingIntent, mIconAction);
+        return Objects.hash(mId, mTitle, mSummary, mSeverityLevel, mSeverityUnspecifiedIconType,
+                mEnabled, mPendingIntent, mIconAction);
     }
 
     @Override
@@ -243,7 +244,7 @@ public final class SafetyCenterEntry implements Parcelable {
                 + ", mTitle=" + mTitle
                 + ", mSummary=" + mSummary
                 + ", mSeverityLevel=" + mSeverityLevel
-                + ", mSeverityNoneIconType=" + mSeverityNoneIconType
+                + ", mSeverityUnspecifiedIconType=" + mSeverityUnspecifiedIconType
                 + ", mEnabled=" + mEnabled
                 + ", mAction=" + mPendingIntent
                 + ", mIconAction=" + mIconAction
@@ -261,7 +262,7 @@ public final class SafetyCenterEntry implements Parcelable {
         TextUtils.writeToParcel(mTitle, dest, flags);
         TextUtils.writeToParcel(mSummary, dest, flags);
         dest.writeInt(mSeverityLevel);
-        dest.writeInt(mSeverityNoneIconType);
+        dest.writeInt(mSeverityUnspecifiedIconType);
         dest.writeBoolean(mEnabled);
         dest.writeParcelable(mPendingIntent, flags);
         dest.writeParcelable(mIconAction, flags);
@@ -275,7 +276,7 @@ public final class SafetyCenterEntry implements Parcelable {
                     .setTitle(TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in))
                     .setSummary(TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in))
                     .setSeverityLevel(in.readInt())
-                    .setSeverityNoneIconType(in.readInt())
+                    .setSeverityUnspecifiedIconType(in.readInt())
                     .setEnabled(in.readBoolean())
                     .setPendingIntent(
                             in.readParcelable(
@@ -300,8 +301,8 @@ public final class SafetyCenterEntry implements Parcelable {
         private CharSequence mSummary;
         @EntrySeverityLevel
         private int mSeverityLevel = ENTRY_SEVERITY_LEVEL_UNKNOWN;
-        @SeverityNoneIconType
-        private int mSeverityNoneIconType = SEVERITY_NONE_ICON_TYPE_NO_ICON;
+        @SeverityUnspecifiedIconType
+        private int mSeverityUnspecifiedIconType = SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON;
         private boolean mEnabled = true;
         private PendingIntent mPendingIntent;
         private IconAction mIconAction;
@@ -324,7 +325,7 @@ public final class SafetyCenterEntry implements Parcelable {
             mTitle = safetyCenterEntry.mTitle;
             mSummary = safetyCenterEntry.mSummary;
             mSeverityLevel = safetyCenterEntry.mSeverityLevel;
-            mSeverityNoneIconType = safetyCenterEntry.mSeverityNoneIconType;
+            mSeverityUnspecifiedIconType = safetyCenterEntry.mSeverityUnspecifiedIconType;
             mEnabled = safetyCenterEntry.mEnabled;
             mPendingIntent = safetyCenterEntry.mPendingIntent;
             mIconAction = safetyCenterEntry.mIconAction;
@@ -362,12 +363,13 @@ public final class SafetyCenterEntry implements Parcelable {
         }
 
         /**
-         * Sets the {@link SeverityNoneIconType} for this entry. Defaults to {@link
-         * #SEVERITY_NONE_ICON_TYPE_NO_ICON}.
+         * Sets the {@link SeverityUnspecifiedIconType} for this entry. Defaults to {@link
+         * #SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON}.
          */
         @NonNull
-        public Builder setSeverityNoneIconType(@SeverityNoneIconType int severityNoneIconType) {
-            mSeverityNoneIconType = severityNoneIconType;
+        public Builder setSeverityUnspecifiedIconType(
+                @SeverityUnspecifiedIconType int severityUnspecifiedIconType) {
+            mSeverityUnspecifiedIconType = severityUnspecifiedIconType;
             return this;
         }
 
@@ -408,7 +410,7 @@ public final class SafetyCenterEntry implements Parcelable {
                     mTitle,
                     mSummary,
                     mSeverityLevel,
-                    mSeverityNoneIconType,
+                    mSeverityUnspecifiedIconType,
                     mEnabled,
                     mPendingIntent,
                     mIconAction);
diff --git a/framework-s/java/android/safetycenter/SafetyCenterEntryGroup.java b/framework-s/java/android/safetycenter/SafetyCenterEntryGroup.java
index ac371c789..e7f11edf7 100644
--- a/framework-s/java/android/safetycenter/SafetyCenterEntryGroup.java
+++ b/framework-s/java/android/safetycenter/SafetyCenterEntryGroup.java
@@ -50,8 +50,8 @@ public final class SafetyCenterEntryGroup implements Parcelable {
     private final CharSequence mSummary;
     @SafetyCenterEntry.EntrySeverityLevel
     private final int mSeverityLevel;
-    @SafetyCenterEntry.SeverityNoneIconType
-    private final int mSeverityNoneIconType;
+    @SafetyCenterEntry.SeverityUnspecifiedIconType
+    private final int mSeverityUnspecifiedIconType;
     @NonNull
     private final List<SafetyCenterEntry> mEntries;
 
@@ -60,13 +60,13 @@ public final class SafetyCenterEntryGroup implements Parcelable {
             @NonNull CharSequence title,
             @Nullable CharSequence summary,
             @SafetyCenterEntry.EntrySeverityLevel int severityLevel,
-            @SafetyCenterEntry.SeverityNoneIconType int severityNoneIconType,
+            @SafetyCenterEntry.SeverityUnspecifiedIconType int severityUnspecifiedIconType,
             @NonNull List<SafetyCenterEntry> entries) {
         mId = requireNonNull(id);
         mTitle = requireNonNull(title);
         mSummary = summary;
         mSeverityLevel = severityLevel;
-        mSeverityNoneIconType = severityNoneIconType;
+        mSeverityUnspecifiedIconType = severityUnspecifiedIconType;
         mEntries = new ArrayList<>(entries);
     }
 
@@ -99,10 +99,10 @@ public final class SafetyCenterEntryGroup implements Parcelable {
         return mSeverityLevel;
     }
 
-    /** Returns the {@link SafetyCenterEntry.SeverityNoneIconType} for this entry group. */
-    @SafetyCenterEntry.SeverityNoneIconType
-    public int getSeverityNoneIconType() {
-        return mSeverityNoneIconType;
+    /** Returns the {@link SafetyCenterEntry.SeverityUnspecifiedIconType} for this entry group. */
+    @SafetyCenterEntry.SeverityUnspecifiedIconType
+    public int getSeverityUnspecifiedIconType() {
+        return mSeverityUnspecifiedIconType;
     }
 
     /** Returns the entries that comprise this entry group. */
@@ -117,7 +117,7 @@ public final class SafetyCenterEntryGroup implements Parcelable {
         if (o == null || getClass() != o.getClass()) return false;
         SafetyCenterEntryGroup that = (SafetyCenterEntryGroup) o;
         return mSeverityLevel == that.mSeverityLevel
-                && mSeverityNoneIconType == that.mSeverityNoneIconType
+                && mSeverityUnspecifiedIconType == that.mSeverityUnspecifiedIconType
                 && Objects.equals(mId, that.mId)
                 && TextUtils.equals(mTitle, that.mTitle)
                 && TextUtils.equals(mSummary, that.mSummary)
@@ -126,7 +126,8 @@ public final class SafetyCenterEntryGroup implements Parcelable {
 
     @Override
     public int hashCode() {
-        return Objects.hash(mId, mTitle, mSummary, mSeverityLevel, mSeverityNoneIconType, mEntries);
+        return Objects.hash(mId, mTitle, mSummary, mSeverityLevel, mSeverityUnspecifiedIconType,
+                mEntries);
     }
 
     @Override
@@ -136,7 +137,7 @@ public final class SafetyCenterEntryGroup implements Parcelable {
                 + ", mTitle=" + mTitle
                 + ", mSummary=" + mSummary
                 + ", mSeverityLevel=" + mSeverityLevel
-                + ", mSeverityNoneIconType=" + mSeverityNoneIconType
+                + ", mSeverityUnspecifiedIconType=" + mSeverityUnspecifiedIconType
                 + ", mEntries=" + mEntries
                 + '}';
     }
@@ -152,7 +153,7 @@ public final class SafetyCenterEntryGroup implements Parcelable {
         TextUtils.writeToParcel(mTitle, dest, flags);
         TextUtils.writeToParcel(mSummary, dest, flags);
         dest.writeInt(mSeverityLevel);
-        dest.writeInt(mSeverityNoneIconType);
+        dest.writeInt(mSeverityUnspecifiedIconType);
         dest.writeTypedList(mEntries);
     }
 
@@ -165,7 +166,7 @@ public final class SafetyCenterEntryGroup implements Parcelable {
                             .setTitle(TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in))
                             .setSummary(TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in))
                             .setSeverityLevel(in.readInt())
-                            .setSeverityNoneIconType(in.readInt())
+                            .setSeverityUnspecifiedIconType(in.readInt())
                             .setEntries(in.createTypedArrayList(SafetyCenterEntry.CREATOR))
                             .build();
                 }
@@ -183,8 +184,9 @@ public final class SafetyCenterEntryGroup implements Parcelable {
         private CharSequence mSummary;
         @SafetyCenterEntry.EntrySeverityLevel
         private int mSeverityLevel = SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN;
-        @SafetyCenterEntry.SeverityNoneIconType
-        private int mSeverityNoneIconType = SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_NO_ICON;
+        @SafetyCenterEntry.SeverityUnspecifiedIconType
+        private int mSeverityUnspecifiedIconType =
+                SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON;
         private List<SafetyCenterEntry> mEntries;
 
         /**
@@ -207,7 +209,7 @@ public final class SafetyCenterEntryGroup implements Parcelable {
             mTitle = safetyCenterEntryGroup.mTitle;
             mSummary = safetyCenterEntryGroup.mSummary;
             mSeverityLevel = safetyCenterEntryGroup.mSeverityLevel;
-            mSeverityNoneIconType = safetyCenterEntryGroup.mSeverityNoneIconType;
+            mSeverityUnspecifiedIconType = safetyCenterEntryGroup.mSeverityUnspecifiedIconType;
             mEntries = new ArrayList<>(safetyCenterEntryGroup.mEntries);
         }
 
@@ -243,13 +245,13 @@ public final class SafetyCenterEntryGroup implements Parcelable {
         }
 
         /**
-         * Sets the {@link SafetyCenterEntry.SeverityNoneIconType} of this entry group. Defaults to
-         * {@link SafetyCenterEntry#SEVERITY_NONE_ICON_TYPE_NO_ICON}.
+         * Sets the {@link SafetyCenterEntry.SeverityUnspecifiedIconType} of this entry group.
+         * Defaults to {@link SafetyCenterEntry#SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON}.
          */
         @NonNull
-        public Builder setSeverityNoneIconType(
-                @SafetyCenterEntry.SeverityNoneIconType int severityNoneIconType) {
-            mSeverityNoneIconType = severityNoneIconType;
+        public Builder setSeverityUnspecifiedIconType(
+                @SafetyCenterEntry.SeverityUnspecifiedIconType int severityUnspecifiedIconType) {
+            mSeverityUnspecifiedIconType = severityUnspecifiedIconType;
             return this;
         }
 
@@ -267,7 +269,7 @@ public final class SafetyCenterEntryGroup implements Parcelable {
         @NonNull
         public SafetyCenterEntryGroup build() {
             return new SafetyCenterEntryGroup(
-                    mId, mTitle, mSummary, mSeverityLevel, mSeverityNoneIconType, mEntries);
+                    mId, mTitle, mSummary, mSeverityLevel, mSeverityUnspecifiedIconType, mEntries);
         }
     }
 }
diff --git a/service/java/com/android/safetycenter/SafetyCenterDataTracker.java b/service/java/com/android/safetycenter/SafetyCenterDataTracker.java
index e119ce6bd..1cce49a86 100644
--- a/service/java/com/android/safetycenter/SafetyCenterDataTracker.java
+++ b/service/java/com/android/safetycenter/SafetyCenterDataTracker.java
@@ -369,7 +369,7 @@ final class SafetyCenterDataTracker {
                             .setPendingIntent(safetySourceStatus.getPendingIntent()).build();
                 }
                 return toDefaultSafetyCenterEntry(safetySource, safetySource.getPackageName(),
-                        SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_NONE);
+                        SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED);
             }
             case SafetySource.SAFETY_SOURCE_TYPE_STATIC: {
                 return toDefaultSafetyCenterEntry(safetySource, null,
@@ -511,7 +511,7 @@ final class SafetyCenterDataTracker {
         switch (safetyCenterEntrySeverityLevel) {
             case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN:
                 return SafetyCenterStatus.OVERALL_SEVERITY_LEVEL_UNKNOWN;
-            case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_NONE:
+            case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED:
             case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_OK:
                 return SafetyCenterStatus.OVERALL_SEVERITY_LEVEL_OK;
             case SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_RECOMMENDATION:
@@ -547,7 +547,7 @@ final class SafetyCenterDataTracker {
             @SafetySourceStatus.StatusLevel int safetySourceStatusLevel) {
         switch (safetySourceStatusLevel) {
             case SafetySourceStatus.STATUS_LEVEL_NONE:
-                return SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_NONE;
+                return SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED;
             case SafetySourceStatus.STATUS_LEVEL_OK:
                 return SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_OK;
             case SafetySourceStatus.STATUS_LEVEL_RECOMMENDATION:
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryGroupTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryGroupTest.kt
index 4140e40d8..74d3e5f62 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryGroupTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryGroupTest.kt
@@ -100,21 +100,22 @@ class SafetyCenterEntryGroupTest {
                 .severityLevel)
                 .isEqualTo(SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_RECOMMENDATION)
         assertThat(SafetyCenterEntryGroup.Builder(entryGroup1)
-                .setSeverityLevel(SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_NONE)
+                .setSeverityLevel(SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
                 .build()
                 .severityLevel)
-                .isEqualTo(SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_NONE)
+                .isEqualTo(SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
     }
 
     @Test
-    fun getSeverityNoneIconType_returnsSeverityNoneIconType() {
-        assertThat(entryGroup1.severityNoneIconType)
-                .isEqualTo(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_NO_ICON)
+    fun getSeverityUnspecifiedIconType_returnsSeverityUnspecifiedIconType() {
+        assertThat(entryGroup1.severityUnspecifiedIconType)
+                .isEqualTo(SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON)
         assertThat(SafetyCenterEntryGroup.Builder(entryGroup1)
-                .setSeverityNoneIconType(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .setSeverityUnspecifiedIconType(
+                        SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
                 .build()
-                .severityNoneIconType)
-                .isEqualTo(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .severityUnspecifiedIconType)
+                .isEqualTo(SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
     }
 
     @Test
@@ -227,9 +228,10 @@ class SafetyCenterEntryGroupTest {
     }
 
     @Test
-    fun equals_toString_withDifferentSeverityNoneIconTypes_areNotEqual() {
+    fun equals_toString_withDifferentSeverityUnspecifiedIconTypes_areNotEqual() {
         val differentFromEntryGroup1 = SafetyCenterEntryGroup.Builder(entryGroup1)
-                .setSeverityNoneIconType(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .setSeverityUnspecifiedIconType(
+                        SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
                 .build()
 
         assertThat(differentFromEntryGroup1).isNotEqualTo(entryGroup1)
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryTest.kt
index 94fea0017..423815cb6 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterEntryTest.kt
@@ -99,14 +99,15 @@ class SafetyCenterEntryTest {
     }
 
     @Test
-    fun getSeverityNoneIconType_returnsSeverityNoneIconType() {
-        assertThat(entry1.severityNoneIconType).isEqualTo(
-                SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_NO_ICON)
+    fun getSeverityUnspecifiedIconType_returnsSeverityUnspecifiedIconType() {
+        assertThat(entry1.severityUnspecifiedIconType).isEqualTo(
+                SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON)
         assertThat(SafetyCenterEntry.Builder(entry1)
-                .setSeverityNoneIconType(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .setSeverityUnspecifiedIconType(
+                        SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
                 .build()
-                .severityNoneIconType)
-                .isEqualTo(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .severityUnspecifiedIconType)
+                .isEqualTo(SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
     }
 
     @Test
@@ -183,7 +184,8 @@ class SafetyCenterEntryTest {
                 .setTitle("a title")
                 .setSummary("a summary")
                 .setSeverityLevel(SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_OK)
-                .setSeverityNoneIconType(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .setSeverityUnspecifiedIconType(
+                        SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
                 .setPendingIntent(pendingIntent1)
                 .setIconAction(SafetyCenterEntry.IconAction.ICON_ACTION_TYPE_INFO, pendingIntent2)
                 .build()
@@ -191,7 +193,8 @@ class SafetyCenterEntryTest {
                 .setTitle("a title")
                 .setSummary("a summary")
                 .setSeverityLevel(SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_OK)
-                .setSeverityNoneIconType(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .setSeverityUnspecifiedIconType(
+                        SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
                 .setPendingIntent(pendingIntent1)
                 .setIconAction(SafetyCenterEntry.IconAction.ICON_ACTION_TYPE_INFO, pendingIntent2)
                 .build()
@@ -251,9 +254,10 @@ class SafetyCenterEntryTest {
     }
 
     @Test
-    fun equals_toString_withDifferentSeverityNoneIconTypes_areNotEqual() {
+    fun equals_toString_withDifferentSeverityUnspecifiedIconTypes_areNotEqual() {
         val differentFromEntry1 = SafetyCenterEntry.Builder(entry1)
-                .setSeverityNoneIconType(SafetyCenterEntry.SEVERITY_NONE_ICON_TYPE_PRIVACY)
+                .setSeverityUnspecifiedIconType(
+                        SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
                 .build()
 
         assertThat(differentFromEntry1).isNotEqualTo(entry1)