| commit | adbd13eb0528131765a3cd7da6052c9b2c74fb94 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 02 06:17:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 02 06:17:32 2022 +0000 |
| tree | 076a41b54f54706db12040c0468fbe487aa23640 | |
| parent | ae1b7c6a733572d70a2c05a48d7888f577195fbb [diff] | |
| parent | b151b094ccbf163746eb192df702261904bda7a2 [diff] |
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487 am: f8701c71e6 am: b151b094cc Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576 Change-Id: Ib0d57ffd2c11e804ae31a0f57846c509100ccf93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/notification/zen/ZenRulePreference.java b/src/com/android/settings/notification/zen/ZenRulePreference.java index ee13c28..0b36700 100644 --- a/src/com/android/settings/notification/zen/ZenRulePreference.java +++ b/src/com/android/settings/notification/zen/ZenRulePreference.java
@@ -91,7 +91,9 @@ @Override public void onClick() { - mContext.startActivity(mIntent); + if (mIntent != null) { + mContext.startActivity(mIntent); + } } @Override