commit c801f18520cd913dd8bed31cfe3a1c6733f269ed
author Nathan Harold <nharold@google.com> Fri Aug 03 10:07:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 03 10:07:35 2018 -0700
tree ffa5ecbc9fc0bf4b18ce4d40fef1edfd06454640
parent e37ebf7ce875203f330e22775cac6a5b8389f070
parent a467b2d0d670e7bffb17933fb63294915227cf0c

[automerger skipped] Merge "Throw on revoked location permission - telephony" am: 9b6ee67985  -s ours am: 2e67825cb6  -s ours
am: a467b2d0d6  -s ours

Change-Id: Id4a6de2cbfadba5cdfb5e2a53730928175193bbe

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