From 548f34b47d3b8a4376a2d203632d7357a6ee811e Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Tue, 14 Jul 2020 13:33:33 -0700 Subject: Add a null check for EuiccProfileInfo access rules at creation Bug: 158780604 Fix: 158780604 Test: Build Change-Id: I6432499309115c7ca29f4704e0f5cfc871eb4d00 Merged-In: I6432499309115c7ca29f4704e0f5cfc871eb4d00 --- telephony/java/android/service/euicc/EuiccProfileInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'telephony/java/android/service') 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. */ -- cgit v1.2.3