diff options
| author | Peter Wang <tpwang@google.com> | 2020-07-16 09:34:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 09:34:33 +0000 |
| commit | 4c7b55f086418d71361de3900f498f2791279a18 (patch) | |
| tree | ca7cd8641f4f85cbe38ecf163756de26d843303a /telephony/java/android/service | |
| parent | 47b34e44c335d7d27415274687748ef178819eff (diff) | |
| parent | 098fb8606a3736282046c101e387218ed6d72ad1 (diff) | |
Merge "Add a null check for EuiccProfileInfo access rules at creation" am: 65f6068c8a am: 098fb8606a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364082
Change-Id: Icca17231fe6b7386e18b9c44a22eebdca2336f24
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. */ |