Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25818d1f authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

Fix the NullPointException am: 5a4df243 am: 5221cb21 

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



Change-Id: Ibf96ed585fd8294bfdcdc9b7351d491515a629bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc8d8e56 5221cb21

src/com/android/settings/ResetNetwork.java

+2 −1
Original line number Diff line number Diff line
@@ -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(),

src/com/android/settings/network/telephony/Enable2gPreferenceController.java

+3 −2
Original line number Diff line number Diff line
@@ -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;
@@ -102,8 +103,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