Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev am: 6b9a904500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286347
Change-Id: I0eee5b81671b29e6ced07b9d8b3c69e4bbe504b5
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index 87c4697..218e3ec 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -41,7 +41,6 @@
import android.telephony.TelephonyManager;
import android.text.Html;
import android.util.ArraySet;
-import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.collection.ArrayMap;
@@ -194,7 +193,6 @@
mSignalStrengthListener.pause();
mTelephonyDisplayInfoListener.pause();
unRegisterReceiver();
- resetProviderPreferenceSummary();
}
@Override
@@ -276,7 +274,6 @@
String result = mSubsPrefCtrlInjector.getNetworkType(
mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive);
if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) {
- Log.i(TAG, "Active cellular network or active carrier network.");
result = mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(R.string.mobile_data_connection_active), result);
} else if (!isDataInService) {
@@ -327,13 +324,6 @@
return icon;
}
- private void resetProviderPreferenceSummary() {
- if (mSubsGearPref == null) {
- return;
- }
- mSubsGearPref.setSummary("");
- }
-
@VisibleForTesting
boolean shouldInflateSignalStrength(int subId) {
return SignalStrengthUtil.shouldInflateSignalStrength(mContext, subId);