commit 1087bd5a94315adf63e8eab1875e7c824c8bf966
author Bill Yi <byi@google.com> Sat Aug 04 07:39:57 2018 -0700
committer android-build-merger <android-build-merger@google.com> Sat Aug 04 07:39:57 2018 -0700
tree ffa5ecbc9fc0bf4b18ce4d40fef1edfd06454640
parent c801f18520cd913dd8bed31cfe3a1c6733f269ed
parent d4ad16c3fbca81cd9711fdc2f482c6d571ba454b

[automerger skipped] Import translations. DO NOT MERGE am: 1f6344b270  -s ours
am: d4ad16c3fb  -s ours

Change-Id: Ic23bcc4cca85307a5f22974afb75236c9e90cc96

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