commit 0d24619ce76d32079613e5a0b1bfcdb2007b2ff7
author Aurimas Liutikas <aurimas@google.com> Wed Dec 12 11:40:53 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 12 11:40:53 2018 -0800
tree 8a23f7272e88146323fa29aab64e27466333270e
parent 39b4ed11835eb1585eb9cfa55d248c2b57234184
parent f5734617f1223c6a9a42be29459dbeb3fdefee06

Merge "Fix multiple substitutions specified in non-positional format."
am: f5734617f1

Change-Id: If202bef8ea4514c9eed89f9c33094b0427c26f04

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