commit 4a409861949d7d1659203018553673b357855b05
author Bonian Chen <bonianchen@google.com> Mon Jun 24 22:56:08 2019 +0800
committer Bonian Chen <bonianchen@google.com> Tue Jun 25 14:56:53 2019 +0000
tree d94c63218dfbacbce113639e4e71b594d811d2fe
parent bbe709eef20a8ab3881d872fe0d45845452b70ee

[Smart Forward] Fix stream close crash

Generate list after stream operation in order to avoid from crash.

Bug: b/135896549
Test: Manual. Get into call setting and check if call setting UI can be
displayed.

Change-Id: I25c833dfbb68ce7bd801f762fbc777f1cd9d4b84

src/com/android/phone/settings/PhoneAccountSettingsFragment.java

diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index f4cd95d..aa6b155 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -38,7 +38,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class PhoneAccountSettingsFragment extends PreferenceFragment
         implements Preference.OnPreferenceChangeListener,
@@ -561,14 +560,15 @@
         if (subscriptions == null) {
             return null;
         }
-        Stream<SubscriptionInfo> effectiveSubscriptions = subscriptions
-                .stream()
-                .filter(subInfo -> !subInfo.isOpportunistic());
-        if (effectiveSubscriptions.count() < 2) {
+
+        List<SubscriptionInfo> effectiveSubscriptions = subscriptions.stream()
+                .filter(subInfo -> !subInfo.isOpportunistic())
+                .collect(Collectors.toList());
+        if (effectiveSubscriptions.size() < 2) {
             return null;
         }
 
-        List<String> componentNames = effectiveSubscriptions
+        List<String> componentNames = effectiveSubscriptions.stream()
                 .map(subInfo -> configManager.getConfigForSubId(subInfo.getSubscriptionId()))
                 .filter(bundle -> (bundle != null))
                 .map(bundle -> bundle.getString(