Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: bd9ce2e4b1

am: f54df6ccfb

Change-Id: I317f715ee814ee1511e67cc57e11ea43af9a2a4c
This commit is contained in:
Sanket Padawe
2017-03-23 00:58:29 +00:00
committed by android-build-merger

View File

@@ -476,7 +476,7 @@ public class DataUsageList extends DataUsageBase {
final ConnectivityManager conn = ConnectivityManager.from(context); final ConnectivityManager conn = ConnectivityManager.from(context);
final TelephonyManager tele = TelephonyManager.from(context); final TelephonyManager tele = TelephonyManager.from(context);
final int slotId = SubscriptionManager.getSlotId(subId); final int slotId = SubscriptionManager.getSlotIndex(subId);
final boolean isReady = tele.getSimState(slotId) == SIM_STATE_READY; final boolean isReady = tele.getSimState(slotId) == SIM_STATE_READY;
boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady; boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady;