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

Revert "[Provider Model] Internet Picker implementation."

Browse Source 
This reverts commit 329d753a29.

Reason for revert: Broken tests on NetworkProviderSettingsTest

Bug: 174285440
Change-Id: I47e6a9479559cb424bd4b8ac0e967f013f2fba86
This commit is contained in:
Jason Chiu
2020-11-26 07:05:00 +00:00
parent 329d753a29
commit ec3d482884
6 changed files with 5 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -41,7 +41,6 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.telephony.DataConnectivityListener;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.network.telephony.MobileNetworkUtils;
@@ -78,6 +77,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
// Map of subscription id to Preference
private Map<Integer, Preference> mSubscriptionPreferences;
private int mStartOrder;
/**
* This interface lets a parent of this class know that some change happened - this could
* either be because overall availability changed, or because we've added/removed/updated some
@@ -291,7 +291,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
// subscriptions with same group UUID.
.filter(subInfo ->
isSubscriptionCanBeDisplayed(mContext, subInfo.getSubscriptionId()))
.count() >= (Utils.isProviderModelEnabled(mContext) ? 1 : 2);
.count() >= 2;
}
@Override