commit c5f8b0eebd020ac024080df8002ffc44059ccb82
author Nathan Harold <nharold@google.com> Fri Aug 10 17:23:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 17:23:49 2018 -0700
tree e93c659a2bc666860228f5527b9fe40813f80d67
parent b58a2e1dca147f53daaabf9a1ab269157dc1626c
parent 378d5e61841518ab249eed644450b9a93842a39c

Merge "Use P SDK Constant To Check NeighboringCell" am: 68f322ab62 am: f6bb9e4baf
am: 378d5e6184

Change-Id: I6d3f944b578c2de63f80632f8f1ead38a7fadd4c

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