[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings

Bug: 147206736
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionUtilTest
      make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataSliceTest

Change-Id: I6d7e72a656723c0620d579e1e223945e2a3588af
This commit is contained in:
changbetty
2020-01-10 18:38:24 +08:00
parent dac6dda583
commit e30517f9a5
4 changed files with 80 additions and 17 deletions

View File

@@ -39,6 +39,7 @@ import androidx.slice.builders.SliceAction;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.MobileDataContentObserver;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBackgroundWorker;
@@ -177,7 +178,7 @@ public class MobileDataSlice implements CustomSliceable {
*/
private boolean isMobileDataAvailable() {
final List<SubscriptionInfo> subInfoList =
mSubscriptionManager.getSelectableSubscriptionInfoList();
SubscriptionUtil.getSelectableSubscriptionInfoList(mContext);
return !(subInfoList == null || subInfoList.isEmpty());
}