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

Fix the NullPointException am: 5a4df243f0

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

Change-Id: Icb8aae31d833d27bb64040af296f096471838785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerngWang
2022-06-20 07:27:56 +00:00
committed by Automerger Merge Worker
parent 42a9ac3a7c 5a4df243f0
commit fd583a0459
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();
}
if (TextUtils.isEmpty(name)) {
name = record.getCarrierName().toString();
CharSequence carrierName = record.getCarrierName();
name = TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
}
if (TextUtils.isEmpty(name)) {
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.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
import androidx.preference.Preference;
@@ -129,8 +130,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
if (subInfo == null) {
return "";
}
final String carrierName = subInfo.getCarrierName().toString();
return carrierName;
CharSequence carrierName = subInfo.getCarrierName();
return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
}
@Override