diff options
| author | Peter Wang <tpwang@google.com> | 2020-07-16 09:15:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 09:15:30 +0000 |
| commit | 098fb8606a3736282046c101e387218ed6d72ad1 (patch) | |
| tree | cfdf5a6ad505496e34a9f0db305ca7f65b841827 /telephony/java/android | |
| parent | 54c4148f8f0d558398854ec41d95e15d24536bdb (diff) | |
| parent | 65f6068c8aeed26f438479f2d381df413a8910e8 (diff) | |
Merge "Add a null check for EuiccProfileInfo access rules at creation" am: 65f6068c8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364082
Change-Id: I293a44af83a949ae26061d8eac0ee69955984395
Diffstat (limited to 'telephony/java/android')
| -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. */ |