commit fd4f729e1fb40372d218cf6385c2c7db478f80bd
author Fan Zhang <zhfan@google.com> Mon Jul 25 14:20:40 2016 -0700
committer Fan Zhang <zhfan@google.com> Mon Jul 25 14:22:00 2016 -0700
tree 18832d59ba60bdab2dac1c9b8f04e25e24f11119
parent d5b3043bba8d9e254f58f954cbe976485d5fe177

Revert "About Phone" summary back to Android version.

Change-Id: Icc834b8fb1fd9235092cee720c904c8532b8e3fc
Fixes: 30355258
Bug: 28419411

src/com/android/settings/DeviceInfoSettings.java

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 7befbc2..dd8064f 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -32,8 +32,6 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -379,39 +377,17 @@
 
         private final Context mContext;
         private final SummaryLoader mSummaryLoader;
-        private final SubscriptionManager mSubscriptionManager;
-        private final SubscriptionChangeListener mSubscriptionChangeListener;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
             mContext = context;
             mSummaryLoader = summaryLoader;
-            mSubscriptionManager = SubscriptionManager.from(mContext);
-            mSubscriptionChangeListener = new SubscriptionChangeListener();
         }
 
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                updateSummary();
-                mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionChangeListener);
-            } else {
-                mSubscriptionManager.removeOnSubscriptionsChangedListener(
-                        mSubscriptionChangeListener);
-            }
-        }
-
-        private void updateSummary() {
-            final String formattedPhoneNumbers = DeviceInfoUtils.getFormattedPhoneNumbers(
-                    mContext, mSubscriptionManager.getActiveSubscriptionInfoList());
-            mSummaryLoader.setSummary(SummaryProvider.this, formattedPhoneNumbers);
-        }
-
-        private final class SubscriptionChangeListener
-                extends SubscriptionManager.OnSubscriptionsChangedListener {
-
-            @Override
-            public void onSubscriptionsChanged() {
-                updateSummary();
+                mSummaryLoader.setSummary(this, mContext.getString(R.string.about_summary,
+                        Build.VERSION.RELEASE));
             }
         }
     }