diff options
author | Peter Wang <tpwang@google.com> | 2020-07-14 13:33:33 -0700 |
---|---|---|
committer | Peter Wang <tpwang@google.com> | 2020-07-14 16:47:51 -0700 |
commit | dd9c188f1eb025abcaaee4cc90ad714d814e0ef2 (patch) | |
tree | 888e7d32d33771d76ea55bf1d5341205cd740768 /telephony/java/android/service | |
parent | eee45eea53e8fb11752dafd2f5b1b484f344e0ae (diff) |
Add a null check for EuiccProfileInfo access rules at creation
Bug: 158780604
Fix: 158780604
Test: Build
Change-Id: I6432499309115c7ca29f4704e0f5cfc871eb4d00
Diffstat (limited to 'telephony/java/android/service')
-rw-r--r-- | telephony/java/android/service/euicc/EuiccProfileInfo.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java index 8450a9018634..92e419707970 100644 --- a/telephony/java/android/service/euicc/EuiccProfileInfo.java +++ b/telephony/java/android/service/euicc/EuiccProfileInfo.java @@ -29,6 +29,7 @@ import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -231,7 +232,9 @@ public final class EuiccProfileInfo implements Parcelable { mState = baseProfile.mState; mCarrierIdentifier = baseProfile.mCarrierIdentifier; mPolicyRules = baseProfile.mPolicyRules; - mAccessRules = Arrays.asList(baseProfile.mAccessRules); + mAccessRules = baseProfile.mAccessRules == null + ? Collections.emptyList() + : Arrays.asList(baseProfile.mAccessRules); } /** Builds the profile instance. */ |