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

Revert "Additional changes to SubscriptionManager API as per API council."

Browse Source 
This reverts commit 1285f74fcb.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
This commit is contained in:
Wink Saville
2014-11-20 20:27:34 +00:00
parent 1285f74fcb
commit 9aa0dd69c5
8 changed files with 80 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/sim/SimBootReceiver.java
View File

@@ -19,6 +19,8 @@ package com.android.settings.sim;
import com.android.settings.R;
import com.android.settings.Settings.SimSettingsActivity;
import java.util.List;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
@@ -29,9 +31,10 @@ import android.content.SharedPreferences.Editor;
import android.content.res.Resources;
import android.support.v4.app.NotificationCompat;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionListener;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.util.Log;
import com.android.settings.Utils;
@@ -44,17 +47,16 @@ public class SimBootReceiver extends BroadcastReceiver {
private SharedPreferences mSharedPreferences = null;
private TelephonyManager mTelephonyManager;
private Context mContext;
private SubscriptionManager mSubscriptionManager;
@Override
public void onReceive(Context context, Intent intent) {
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
mContext = context;
mSubscriptionManager = SubscriptionManager.from(mContext);
mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME,
Context.MODE_PRIVATE);
mSubscriptionManager.registerOnSubscriptionsChangedListener(mSubscriptionListener);
SubscriptionManager.register(mContext, mSubscriptionListener,
SubscriptionListener.LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED);
}
private void detectChangeAndNotify() {
@@ -69,12 +71,12 @@ public class SimBootReceiver extends BroadcastReceiver {
// by checking if the list is empty.
// This is not completely correct, but works for most cases.
// See Bug: 18377252
if (mSubscriptionManager.getActiveSubscriptionInfoList().size() < 1) {
if (SubscriptionManager.getActiveSubscriptionInfoList().size() < 1) {
return;
}
for (int i = 0; i < numSlots; i++) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(mContext, i);
final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
final String key = SLOT_PREFIX+i;
final int lastSubId = getLastSubId(key);
@@ -131,10 +133,9 @@ public class SimBootReceiver extends BroadcastReceiver {
notificationManager.cancel(NOTIFICATION_ID);
}
private final OnSubscriptionsChangedListener mSubscriptionListener =
new OnSubscriptionsChangedListener() {
private final SubscriptionListener mSubscriptionListener = new SubscriptionListener() {
@Override
public void onSubscriptionsChanged() {
public void onSubscriptionInfoChanged() {
detectChangeAndNotify();
}
};