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

This reverts commit e05c0f2174664f12bfb77db898b261c8d3f31f75.

Change-Id: I5b646effaca458cf8b08e707da5fcd3424f17099

4 files changed, 17 insertions, 18 deletions

diff --git a/src/com/android/mms/service/DownloadRequest.java b/src/com/android/mms/service/DownloadRequest.java
index 3f2fbe7..28553e3 100644
--- a/src/com/android/mms/service/DownloadRequest.java
+++ b/src/com/android/mms/service/DownloadRequest.java
@@ -149,7 +149,7 @@ public class DownloadRequest extends MmsRequest {
             if (!TextUtils.isEmpty(mCreator)) {
                 values.put(Telephony.Mms.CREATOR, mCreator);
             }
-            values.put(Telephony.Mms.SUBSCRIPTION_ID, mSubId);
+            values.put(Telephony.Mms.SUB_ID, mSubId);
             if (SqliteWrapper.update(
                     context,
                     context.getContentResolver(),
diff --git a/src/com/android/mms/service/MmsConfigManager.java b/src/com/android/mms/service/MmsConfigManager.java
index 551ad80..2442ac7 100644
--- a/src/com/android/mms/service/MmsConfigManager.java
+++ b/src/com/android/mms/service/MmsConfigManager.java
@@ -22,8 +22,9 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionListener;
 import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
+import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
 
@@ -31,6 +32,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.android.internal.telephony.IccCardConstants;
+import com.android.internal.telephony.TelephonyIntents;
 
 /**
  * This class manages cached copies of all the MMS configuration for each subscription ID.
@@ -50,7 +52,6 @@ public class MmsConfigManager {
     // Map the various subIds to their corresponding MmsConfigs.
     private final Map<Integer, MmsConfig> mSubIdConfigMap = new ArrayMap<Integer, MmsConfig>();
     private Context mContext;
-    private SubscriptionManager mSubscriptionManager;
 
     /**
      * This receiver listens for changes made to SubInfoRecords and for a broadcast telling us
@@ -69,18 +70,15 @@ public class MmsConfigManager {
         }
     };
 
-    private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =
-            new OnSubscriptionsChangedListener() {
+    private final SubscriptionListener mSubscriptionListener = new SubscriptionListener() {
         @Override
-        public void onSubscriptionsChanged() {
+        public void onSubscriptionInfoChanged() {
             loadInBackground();
         }
     };
 
-
     public void init(final Context context) {
         mContext = context;
-        mSubscriptionManager = SubscriptionManager.from(context);
 
         // TODO: When this object "finishes" we should unregister.
         IntentFilter intentFilterLoaded =
@@ -88,14 +86,15 @@ public class MmsConfigManager {
         context.registerReceiver(mReceiver, intentFilterLoaded);
 
         // TODO: When this object "finishes" we should unregister by invoking
-        // SubscriptionManager.getInstance(mContext).unregister(mOnSubscriptionsChangedListener);
+        // SubscriptionManager.unregister(mContext, mSubscriptionListener);
         // This is not strictly necessary because it will be unregistered if the
         // notification fails but it is good form.
 
         // Register for SubscriptionInfo list changes which is guaranteed
-        // to invoke onSubscriptionsChanged the first time.
-        SubscriptionManager.from(mContext).registerOnSubscriptionsChangedListener(
-                mOnSubscriptionsChangedListener);
+        // to invoke onSubscriptionInfoChanged and which in turns calls
+        // loadInBackgroud.
+        SubscriptionManager.register(mContext, mSubscriptionListener,
+                SubscriptionListener.LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED);
     }
 
     private void loadInBackground() {
@@ -138,7 +137,7 @@ public class MmsConfigManager {
      *
      */
     private void load(Context context) {
-        List<SubscriptionInfo> subs = mSubscriptionManager.getActiveSubscriptionInfoList();
+        List<SubscriptionInfo> subs = SubscriptionManager.getActiveSubscriptionInfoList();
         if (subs == null || subs.size() < 1) {
             Log.e(TAG, "MmsConfigManager.load -- empty getActiveSubInfoList");
             return;
diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index 424a978..64e28ab 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -163,7 +163,7 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
         if (!SubscriptionManager.isValidSubId(subId)) {
             throw new RuntimeException("Invalid subId " + subId);
         }
-        if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
+        if (subId == SubscriptionManager.DEFAULT_SUB_ID) {
             return SubscriptionManager.getDefaultSmsSubId();
         }
         return subId;
@@ -449,11 +449,11 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
 
     private void movePendingSimRequestsToRunningSynchronized() {
         Log.d(TAG, "Schedule requests pending on SIM");
-        mCurrentSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        mCurrentSubId = SubscriptionManager.INVALID_SUB_ID;
         while (mPendingSimRequestQueue.size() > 0) {
             final MmsRequest request = mPendingSimRequestQueue.peek();
             if (request != null) {
-                if (mCurrentSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID ||
+                if (mCurrentSubId == SubscriptionManager.INVALID_SUB_ID ||
                         mCurrentSubId == request.getSubId()) {
                     // First or subsequent requests with same SIM ID
                     mPendingSimRequestQueue.remove();
@@ -486,7 +486,7 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
         MmsConfigManager.getInstance().init(this);
         // Initialize running request state
         synchronized (this) {
-            mCurrentSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+            mCurrentSubId = SubscriptionManager.INVALID_SUB_ID;
             mRunningRequestCount = 0;
         }
     }
diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index 2ded6e4..73aa037 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -156,7 +156,7 @@ public class SendRequest extends MmsRequest {
             if (!TextUtils.isEmpty(mCreator)) {
                 values.put(Telephony.Mms.CREATOR, mCreator);
             }
-            values.put(Telephony.Mms.SUBSCRIPTION_ID, mSubId);
+            values.put(Telephony.Mms.SUB_ID, mSubId);
             if (SqliteWrapper.update(context, context.getContentResolver(), messageUri, values,
                     null/*where*/, null/*selectionArg*/) != 1) {
                 Log.e(MmsService.TAG, "SendRequest.persistIfRequired: failed to update message");