PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d

Browse Source 
Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c
This commit is contained in:
Automerger Merge Worker
2019-12-16 08:15:54 +00:00
parent b4fd6cf8c9 40d2a2dd8d
commit 11fa77b023
12 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -50,7 +50,7 @@ public class SubscriptionUtil {
if (sActiveResultsForTesting != null) {
return sActiveResultsForTesting;
}
final List<SubscriptionInfo> subscriptions = manager.getActiveSubscriptionInfoList(true);
final List<SubscriptionInfo> subscriptions = manager.getActiveSubscriptionInfoList();
if (subscriptions == null) {
return new ArrayList<>();
}

2
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -264,7 +264,7 @@ public class MobileNetworkUtils {
if (disableOtherSubscriptions) {
final List<SubscriptionInfo> subInfoList =
subscriptionManager.getActiveSubscriptionInfoList(true);
subscriptionManager.getActiveSubscriptionInfoList();
if (subInfoList != null) {
for (SubscriptionInfo subInfo : subInfoList) {
// We never disable mobile data for opportunistic subscriptions.