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

[Settings Telephony] Carrier name API replacement

Browse Source 
Replacing TelephonyManager.getNetworkOperatorName() by
Obtaining carrier name from SubscriptionInfo.getCarrierName().

TelephonyManager.getNetworkOperatorName() only be used when there's no
SubscriptionInfo can be found.

Bug: 140443508
Test: Manual testing
  atest MobileNetworkUtilsTest
  atest OpenNetworkSelectPagePreferenceControllerTest

Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
This commit is contained in:
Bonian Chen
2019-09-09 15:10:13 +08:00
committed by Andy Chou
parent 5f10a9a9ea
commit 7a4c679790
6 changed files with 113 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/MobileNetworkPreferenceController.java
View File

@@ -37,6 +37,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils;
@@ -162,6 +163,6 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl
@Override
public CharSequence getSummary() {
return mTelephonyManager.getNetworkOperatorName();
return MobileNetworkUtils.getCurrentCarrierNameForDisplay(mContext);
}
}