Fix crash in SubscriptionInfoHelper for null display name.
Test: Add unit test for this case
Bug: 198728993
Change-Id: I3b13843f5229489d3d0625ab7a723f6c7aa1b913
diff --git a/src/com/android/phone/SubscriptionInfoHelper.java b/src/com/android/phone/SubscriptionInfoHelper.java
index 7c373e0..14faebc 100644
--- a/src/com/android/phone/SubscriptionInfoHelper.java
+++ b/src/com/android/phone/SubscriptionInfoHelper.java
@@ -91,7 +91,8 @@
intent.putExtra(SubscriptionInfoHelper.SUB_ID_EXTRA, subscription.getSubscriptionId());
intent.putExtra(
- SubscriptionInfoHelper.SUB_LABEL_EXTRA, subscription.getDisplayName().toString());
+ SubscriptionInfoHelper.SUB_LABEL_EXTRA, subscription.getDisplayName() == null ? null
+ : subscription.getDisplayName().toString());
}
/**
diff --git a/tests/src/com/android/phone/SubscriptionInfoHelperTest.java b/tests/src/com/android/phone/SubscriptionInfoHelperTest.java
new file mode 100644
index 0000000..90f682f
--- /dev/null
+++ b/tests/src/com/android/phone/SubscriptionInfoHelperTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Intent;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import org.junit.Test;
+
+public class SubscriptionInfoHelperTest {
+ private static final String EXTRA_SUBSCRIPTION_LABEL =
+ "com.android.phone.settings.SubscriptionInfoHelper.SubscriptionLabel";
+
+ /**
+ * Ensures {@link SubscriptionInfoHelper#addExtrasToIntent(Intent, SubscriptionInfo)} can
+ * properly handle a null display name without crashing.
+ */
+ @Test
+ public void testAddExtrasToIntentWithNullDisplayName() {
+ Intent intent = new Intent();
+ SubscriptionInfo info = new SubscriptionInfo(1, // id
+ "90210", // iccId
+ 1, // simSlotIndex
+ null, // displayName
+ null, // carrierName
+ SubscriptionManager.NAME_SOURCE_CARRIER_ID, // nameSource
+ 0, //iconTint
+ "555-1212", // number
+ 0, // roaming
+ null, // icon
+ "401", // mcc
+ "384", // mnc
+ "us", // countryIso
+ false, // isEmbedded
+ null, // nativeAccessRules
+ ""); // cardString
+ SubscriptionInfoHelper.addExtrasToIntent(intent, info);
+ assertNull(intent.getStringExtra(EXTRA_SUBSCRIPTION_LABEL));
+ assertTrue(intent.hasExtra(EXTRA_SUBSCRIPTION_LABEL));
+ }
+}