Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev (b9b69faf) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DataUsageSummary.java

+7 −10

Original line number	Diff line number	Diff line
		@@ -195,7 +195,6 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		private INetworkStatsService mStatsService;
		private NetworkPolicyManager mPolicyManager;
		private TelephonyManager mTelephonyManager;
		private SubscriptionManager mSubscriptionManager;

		private INetworkStatsSession mStatsSession;

		@@ -287,14 +286,13 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
		mPolicyManager = NetworkPolicyManager.from(context);
		mTelephonyManager = TelephonyManager.from(context);
		mSubscriptionManager = SubscriptionManager.from(context);

		mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);

		mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
		mPolicyEditor.read();

		mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
		mSubInfoList = SimSettings.getSortedSubInfoList(getActivity());
		mMobileTagMap = initMobileTabTag(mSubInfoList);

		try {
		@@ -944,7 +942,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		} else {
		//SUB SELECT
		isEnable = mTelephonyManager.getDataEnabled()
		&& (subId == mSubscriptionManager.getDefaultDataSubId());
		&& (subId == SubscriptionManager.getDefaultDataSubId());
		}
		return isEnable;
		}
		@@ -1133,8 +1131,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable

		private void handleMultiSimDataDialog() {
		final SubscriptionInfo currentSir = getCurrentTabSubInfo(getActivity());
		final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo(
		mSubscriptionManager.getDefaultDataSubId());
		final SubscriptionInfo nextSir = SubscriptionManager.getSubscriptionInfoForSubscriber(
		SubscriptionManager.getDefaultDataSubId());

		if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
		setMobileDataEnabled(true);
		@@ -1151,7 +1149,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
		@Override
		public void onClick(DialogInterface dialog, int id) {
		mSubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId());
		SubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId());
		setMobileDataEnabled(true);
		updateBody();
		}
		@@ -2248,7 +2246,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		final NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE);
		if (template == null) {
		final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		SubscriptionManager.INVALID_SUB_ID);
		if (SubscriptionManager.isValidSubId(subId)) {
		return TAB_MOBILE + String.valueOf(subId);
		}
		@@ -2341,8 +2339,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
		final ConnectivityManager conn = ConnectivityManager.from(context);
		final TelephonyManager tele = TelephonyManager.from(context);

		final List<SubscriptionInfo> subInfoList =
		SubscriptionManager.from(context).getActiveSubscriptionInfoList();
		final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
		// No activated Subscription
		if (subInfoList == null) {
		return false;

src/com/android/settings/IccLockSettings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ public class IccLockSettings extends PreferenceActivity
		mTabHost.clearAllTabs();

		for (int i = 0; i < numSims; ++i) {
		final SubscriptionInfo subInfo = Utils.findRecordBySlotId(this, i);
		final SubscriptionInfo subInfo = Utils.findRecordBySlotId(i);
		mTabHost.addTab(buildTabSpec(String.valueOf(i),
		String.valueOf(subInfo == null
		? context.getString(R.string.sim_editor_title, i + 1)
		@@ -469,7 +469,7 @@ public class IccLockSettings extends PreferenceActivity
		@Override
		public void onTabChanged(String tabId) {
		final int slotId = Integer.parseInt(tabId);
		final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), slotId);
		final SubscriptionInfo sir = Utils.findRecordBySlotId(slotId);

		mPhone = (sir == null) ? null
		: PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));

src/com/android/settings/SecuritySettings.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -111,7 +111,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
		private static final boolean ONLY_ONE_TRUST_AGENT = true;

		private DevicePolicyManager mDPM;
		private SubscriptionManager mSubscriptionManager;

		private ChooseLockSettingsHelper mChooseLockSettingsHelper;
		private LockPatternUtils mLockPatternUtils;
		@@ -371,10 +370,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
		/* Return true if a SIM is ready for locking.
		* TODO: consider adding to TelephonyManager or SubscritpionManasger.
		*/
		private boolean isSimReady() {
		private static boolean isSimReady() {
		int simState = TelephonyManager.SIM_STATE_UNKNOWN;
		final List<SubscriptionInfo> subInfoList =
		mSubscriptionManager.getActiveSubscriptionInfoList();
		final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
		if (subInfoList != null) {
		for (SubscriptionInfo subInfo : subInfoList) {
		simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex());

src/com/android/settings/Utils.java

+17 −21

Original line number	Diff line number	Diff line
		@@ -988,10 +988,9 @@ public final class Utils {
		* finds a record with subId.
		* Since the number of SIMs are few, an array is fine.
		*/
		public static SubscriptionInfo findRecordBySubId(Context context, final int subId) {
		public static SubscriptionInfo findRecordBySubId(final int subId) {
		final List<SubscriptionInfo> subInfoList =
		SubscriptionManager.from(context).getActiveSubscriptionInfoList();
		if (subInfoList != null) {
		SubscriptionManager.getActiveSubscriptionInfoList();
		final int subInfoLength = subInfoList.size();

		for (int i = 0; i < subInfoLength; ++i) {
		@@ -1000,7 +999,6 @@ public final class Utils {
		return sir;
		}
		}
		}

		return null;
		}
		@@ -1009,10 +1007,9 @@ public final class Utils {
		* finds a record with slotId.
		* Since the number of SIMs are few, an array is fine.
		*/
		public static SubscriptionInfo findRecordBySlotId(Context context, final int slotId) {
		public static SubscriptionInfo findRecordBySlotId(final int slotId) {
		final List<SubscriptionInfo> subInfoList =
		SubscriptionManager.from(context).getActiveSubscriptionInfoList();
		if (subInfoList != null) {
		SubscriptionManager.getActiveSubscriptionInfoList();
		final int subInfoLength = subInfoList.size();

		for (int i = 0; i < subInfoLength; ++i) {
		@@ -1022,7 +1019,6 @@ public final class Utils {
		return sir;
		}
		}
		}

		return null;
		}

src/com/android/settings/deviceinfo/ImeiInformation.java

+5 −8

Original line number	Diff line number	Diff line
		@@ -42,12 +42,9 @@ public class ImeiInformation extends PreferenceActivity {
		private static final String KEY_IMEI = "imei";
		private static final String KEY_IMEI_SV = "imei_sv";

		private SubscriptionManager mSubscriptionManager;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		mSubscriptionManager = SubscriptionManager.from(this);
		final TelephonyManager telephonyManager =
		(TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
		initPreferenceScreen(telephonyManager.getSimCount());
		@@ -103,17 +100,17 @@ public class ImeiInformation extends PreferenceActivity {
		}
		}

		private Phone getPhoneFromSlotId(int slotIdx) {
		final SubscriptionInfo subInfo =
		mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(slotIdx);
		private Phone getPhoneFromSlotId(int slotId) {
		final List<SubscriptionInfo> subInfos = SubscriptionManager.getSubscriptionInfoUsingSlotId(slotId);

		if (subInfo == null) {
		if (subInfos == null \|\| subInfos.size() < 1) {
		return null;
		}

		final Phone[] phones = PhoneFactory.getPhones();
		for (int i = 0; i < phones.length; i++) {
		if (phones[i].getSubId() == subInfo.getSubscriptionId()) {
		// Currently we only operate with the first subscription of a SIM.
		if (phones[i].getSubId() == subInfos.get(0).getSubscriptionId()) {
		return phones[i];
		}
		}