commit fbe47941b01c0f86450e6f5294ee30c58108b062
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 13 05:45:20 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 13 05:45:20 2018 +0000
tree e2d5a9dc21a9c4fe4913e4675b8775551e6080b5
parent 8a2afc01dca1030df60911a0e792658ec301486b
parent 0431808fae276b58812fcffe55eba64f35cc927f

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"

src/com/android/phone/NetworkSelectListPreference.java

diff --git a/src/com/android/phone/NetworkSelectListPreference.java b/src/com/android/phone/NetworkSelectListPreference.java
index 9af1c77..df3f44a 100644
--- a/src/com/android/phone/NetworkSelectListPreference.java
+++ b/src/com/android/phone/NetworkSelectListPreference.java
@@ -103,7 +103,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 9b905b4..d9731be 100644
--- a/src/com/android/phone/NetworkSelectSetting.java
+++ b/src/com/android/phone/NetworkSelectSetting.java
@@ -166,7 +166,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