From e31783806cb38939d42072002ccced12b0be480e Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Fri, 13 May 2022 05:35:34 +0000 Subject: Revert "Validate SafetyEvent conditional fields" This reverts commit c0b6d1110c7ab04b6eaaed23897246a622992cb9. Reason for revert: Breaking SafetySourceBroadcastReceiverTest Bug: 232145041 Change-Id: Ie7019de8f3fe1e11c5b1a59b734ab989668ff875 --- .../java/android/safetycenter/SafetyEvent.java | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'framework-s/java') diff --git a/framework-s/java/android/safetycenter/SafetyEvent.java b/framework-s/java/android/safetycenter/SafetyEvent.java index 99b085537..1846df35e 100644 --- a/framework-s/java/android/safetycenter/SafetyEvent.java +++ b/framework-s/java/android/safetycenter/SafetyEvent.java @@ -285,30 +285,6 @@ public final class SafetyEvent implements Parcelable { /** Creates the {@link SafetyEvent} represented by this {@link Builder}. */ @NonNull public SafetyEvent build() { - switch (mType) { - case SAFETY_EVENT_TYPE_REFRESH_REQUESTED: - if (mRefreshBroadcastId == null) { - throw new IllegalArgumentException( - "Missing refresh broadcast id for refresh requested safety event"); - } - break; - case SAFETY_EVENT_TYPE_RESOLVING_ACTION_SUCCEEDED: - case SAFETY_EVENT_TYPE_RESOLVING_ACTION_FAILED: - if (mSafetySourceIssueId == null) { - throw new IllegalArgumentException( - String.format( - "Missing issue id for resolving action safety event (%s)", - mType)); - } - if (mSafetySourceIssueActionId == null) { - throw new IllegalArgumentException( - String.format( - "Missing issue action id for resolving action safety event " - + "(%s)", - mType)); - } - break; - } return new SafetyEvent( mType, mRefreshBroadcastId, mSafetySourceIssueId, mSafetySourceIssueActionId); } -- cgit v1.2.3-59-g8ed1b