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

Snap for 8740412 from 5a4df243f0 to tm-release

Browse Source 
Change-Id: Ib7f8ac9ab40af961be1c0eb92e6d07a1d8274a6b
This commit is contained in:
Android Build Coastguard Worker
2022-06-18 01:24:43 +00:00
parent cd7d3aaf25 5a4df243f0
commit ca0a8d5ed2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ResetNetwork.java
View File

@@ -201,7 +201,8 @@ public class ResetNetwork extends InstrumentedFragment {
name = record.getNumber(); name = record.getNumber();
} }
if (TextUtils.isEmpty(name)) { if (TextUtils.isEmpty(name)) {
name = record.getCarrierName().toString(); CharSequence carrierName = record.getCarrierName();
name = TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
} }
if (TextUtils.isEmpty(name)) { if (TextUtils.isEmpty(name)) {
name = String.format("MCC:%s MNC:%s Slot:%s Id:%s", record.getMcc(), name = String.format("MCC:%s MNC:%s Slot:%s Id:%s", record.getMcc(),

5
src/com/android/settings/network/telephony/Enable2gPreferenceController.java
View File

@@ -22,6 +22,7 @@ import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -102,8 +103,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
if (subInfo == null) { if (subInfo == null) {
return ""; return "";
} }
final String carrierName = subInfo.getCarrierName().toString(); CharSequence carrierName = subInfo.getCarrierName();
return carrierName; return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
} }
@Override @Override