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

Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev am: 6b9a904500

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286347

Change-Id: I4084b5ac506dd82e9e222668f28e8e7e343cda8d
This commit is contained in:
Bonian Chen
2022-03-21 09:34:31 +00:00
committed by Automerger Merge Worker
parent cdccedb20d 6b9a904500
commit ed98a76f2d
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -41,7 +41,6 @@ import android.telephony.TelephonyDisplayInfo;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.Html; import android.text.Html;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.collection.ArrayMap; import androidx.collection.ArrayMap;
@@ -194,7 +193,6 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
mSignalStrengthListener.pause(); mSignalStrengthListener.pause();
mTelephonyDisplayInfoListener.pause(); mTelephonyDisplayInfoListener.pause();
unRegisterReceiver(); unRegisterReceiver();
resetProviderPreferenceSummary();
} }
@Override @Override
@@ -276,7 +274,6 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
String result = mSubsPrefCtrlInjector.getNetworkType( String result = mSubsPrefCtrlInjector.getNetworkType(
mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive); mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive);
if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || 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, result = mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(R.string.mobile_data_connection_active), result); mContext.getString(R.string.mobile_data_connection_active), result);
} else if (!isDataInService) { } else if (!isDataInService) {
@@ -327,13 +324,6 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
return icon; return icon;
} }
private void resetProviderPreferenceSummary() {
if (mSubsGearPref == null) {
return;
}
mSubsGearPref.setSummary("");
}
@VisibleForTesting @VisibleForTesting
boolean shouldInflateSignalStrength(int subId) { boolean shouldInflateSignalStrength(int subId) {
return SignalStrengthUtil.shouldInflateSignalStrength(mContext, subId); return SignalStrengthUtil.shouldInflateSignalStrength(mContext, subId);