commit e37ebf7ce875203f330e22775cac6a5b8389f070
author Hall Liu <hallliu@google.com> Wed Aug 01 17:35:23 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 01 17:35:23 2018 -0700
tree ffa5ecbc9fc0bf4b18ce4d40fef1edfd06454640
parent e05b92432011190b88316a48c7a9a1f18342ad94
parent b4b0905f4d120f64c62e36e62a9e5199e0049d81

Merge "TeleService: Reset the duration after the CDMA call is accepted" am: 34401800a1 am: 6392a72771
am: b4b0905f4d

Change-Id: Iacca0fa8a35d727ed1809d4cd1ad60ddda803632

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