commit f005ff9fd1882cbbff50ed69c4509fcc75e57cb4
author Cassie <xih@google.com> Mon Jul 16 13:07:59 2018 -0700
committer Xi Han <xih@google.com> Mon Jul 23 19:33:13 2018 +0000
tree 006cf961d6eb980819bde7331de6bbbe7f95ad3c
parent 38fb17b4a2517bd436a30b22cddde9974e6cdb9a

Clean cherry-pick 'Handles the case when getForbiddenPlmns() returns null.'

Bug: 111490801
Test: Manual test
Change-Id: I1dafdbb874468a8de15f7fad6de5a1478592c1ba
Merged-In: I1dafdbb874468a8de15f7fad6de5a1478592c1ba

src/com/android/phone/NetworkSelectListPreference.java

diff --git a/src/com/android/phone/NetworkSelectListPreference.java b/src/com/android/phone/NetworkSelectListPreference.java
index 71a9dab..341ac8d 100644
--- a/src/com/android/phone/NetworkSelectListPreference.java
+++ b/src/com/android/phone/NetworkSelectListPreference.java
@@ -105,7 +105,8 @@
         new AsyncTask<Void, Void, List<String>>() {
             @Override
             protected List<String> doInBackground(Void... voids) {
-                return Arrays.asList(telephonyManager.getForbiddenPlmns());
+                String[] forbiddenPlmns = telephonyManager.getForbiddenPlmns();
+                return forbiddenPlmns != null ? Arrays.asList(forbiddenPlmns) : null;
             }
 
             @Override

src/com/android/phone/NetworkSelectSetting.java

diff --git a/src/com/android/phone/NetworkSelectSetting.java b/src/com/android/phone/NetworkSelectSetting.java
index 71162bb..0655a2e 100644
--- a/src/com/android/phone/NetworkSelectSetting.java
+++ b/src/com/android/phone/NetworkSelectSetting.java
@@ -160,7 +160,8 @@
         new AsyncTask<Void, Void, List<String>>() {
             @Override
             protected List<String> doInBackground(Void... voids) {
-                return Arrays.asList(mTelephonyManager.getForbiddenPlmns());
+                String[] forbiddenPlmns = mTelephonyManager.getForbiddenPlmns();
+                return forbiddenPlmns != null ? Arrays.asList(forbiddenPlmns) : null;
             }
 
             @Override