From 9aa0dd69c53fabfbd4e894e5eca6c9b6d879fdd3 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Thu, 20 Nov 2014 20:27:34 +0000 Subject: Revert "Additional changes to SubscriptionManager API as per API council." This reverts commit 1285f74fcb6a8bf080c224e5a36db00ab1167d4c. Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e --- src/com/android/settings/deviceinfo/ImeiInformation.java | 13 +++++-------- src/com/android/settings/deviceinfo/SimStatus.java | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'src/com/android/settings/deviceinfo') diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java index 72d3158..921ef8e 100644 --- a/src/com/android/settings/deviceinfo/ImeiInformation.java +++ b/src/com/android/settings/deviceinfo/ImeiInformation.java @@ -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 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]; } } diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java index 11daf0c..46addf3 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. +* limitations under the License. */ package com.android.settings.deviceinfo; @@ -143,7 +143,7 @@ public class SimStatus extends PreferenceActivity { mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH); for (int i = 0; i < mTelephonyManager.getSimCount(); i++) { - final SubscriptionInfo sir = Utils.findRecordBySlotId(this, i); + final SubscriptionInfo sir = Utils.findRecordBySlotId(i); if (sir != null) { mSelectableSubInfos.add(sir); } @@ -355,7 +355,7 @@ public class SimStatus extends PreferenceActivity { final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId( mSir.getSubscriptionId())); if (UserHandle.myUserId() == UserHandle.USER_OWNER - && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUB_ID) { if (phone == null) { Log.e(TAG, "Unable to locate a phone object for the given Subscription ID."); return; -- cgit v1.1