commit b58a2e1dca147f53daaabf9a1ab269157dc1626c
author Youming Ye <paulye@google.com> Fri Aug 10 17:21:30 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 17:21:30 2018 -0700
tree 651ff36ad5981e68a060b6926c5537c7231356b7
parent ee5afe67ea0cff99890adc8b1dc80f125fa76f52
parent 3d5dbb9d4c17d63b8764501a4f4e7e6ff9b41314

Merge "Fix resource warnings." am: 63d3dfc2c7 am: a755e7971e
am: 3d5dbb9d4c

Change-Id: I342a7e0a9b12d3ac575f397afb27e3372181d20c

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