From 548f34b47d3b8a4376a2d203632d7357a6ee811e Mon Sep 17 00:00:00 2001
From: Peter Wang <tpwang@google.com>
Date: Tue, 14 Jul 2020 13:33:33 -0700
Subject: [PATCH] Add a null check for EuiccProfileInfo access rules at
 creation

Bug: 158780604
Fix: 158780604
Test: Build
Change-Id: I6432499309115c7ca29f4704e0f5cfc871eb4d00
Merged-In: I6432499309115c7ca29f4704e0f5cfc871eb4d00
---
 .../service/euicc/EuiccProfileInfoTest.java   | 23 +++++++++++++++++++
 .../service/euicc/EuiccProfileInfo.java       |  5 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java b/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java
index d00d052db5906..0af8c728aba31 100644
--- a/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java
+++ b/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java
@@ -153,6 +153,29 @@ public class EuiccProfileInfoTest {
         assertEquals(p.hashCode(), copied.hashCode());
     }
 
+    @Test
+    public void testBuilder_BasedOnAnotherProfileWithEmptyAccessRules() {
+        EuiccProfileInfo p =
+                new EuiccProfileInfo.Builder("21430000000000006587")
+                        .setNickname("profile nickname")
+                        .setProfileName("profile name")
+                        .setServiceProviderName("service provider")
+                        .setCarrierIdentifier(
+                                new CarrierIdentifier(
+                                        new byte[] {0x23, 0x45, 0x67},
+                                        "123",
+                                        "45"))
+                        .setState(EuiccProfileInfo.PROFILE_STATE_ENABLED)
+                        .setProfileClass(EuiccProfileInfo.PROFILE_CLASS_OPERATIONAL)
+                        .setPolicyRules(EuiccProfileInfo.POLICY_RULE_DO_NOT_DELETE)
+                        .setUiccAccessRule(null)
+                        .build();
+
+        EuiccProfileInfo copied = new EuiccProfileInfo.Builder(p).build();
+
+        assertEquals(null, copied.getUiccAccessRules());
+    }
+
     @Test
     public void testEqualsHashCode() {
         EuiccProfileInfo p =
diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java
index 8450a9018634b..92e4197079700 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. */