commit ee5afe67ea0cff99890adc8b1dc80f125fa76f52
author Nathan Harold <nharold@google.com> Thu Aug 09 16:39:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 09 16:39:53 2018 -0700
tree 8fc2db1f9f0d537431da0dabbe0de9601764e583
parent 1c421cb024ec46b0dd664775194c7cf2f25d11aa
parent 38efcb96f5d2c694b9683401c8ae97ad0d2170df

Merge "Construct NeighborCell from CellInfo" am: 22eca8caf0 am: ad522a33cd
am: 38efcb96f5

Change-Id: Ia08f614428f5c08cb6a148115300d9bf65274b3d

src/com/android/phone/NetworkSelectListPreference.java

diff --git a/src/com/android/phone/NetworkSelectListPreference.java b/src/com/android/phone/NetworkSelectListPreference.java
index 51a678d..b1d5544 100644
--- a/src/com/android/phone/NetworkSelectListPreference.java
+++ b/src/com/android/phone/NetworkSelectListPreference.java
@@ -99,7 +99,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 96e4a26..1d0f040 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