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

Commit fcb7847b authored by Ling Ma's avatar Ling Ma
Browse files

BugFix - null check 

Factory reset when SIM card is removed, phone.setAllowedNetworkTypes(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, defaultNetworkType, null)

Test: BUILD succeed
Bug: 215487487
Change-Id: Ibc747badd85a7dbb3eef8678ab61b1513c549094
Merged-In: Ibc747badd85a7dbb3eef8678ab61b1513c549094
parent 1f52cc02

src/java/com/android/internal/telephony/Phone.java

+12 −7
Original line number Diff line number Diff line
@@ -2430,24 +2430,29 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     *

     * @param reason reason to configure allowed network type

     * @param networkTypes one of the network types

     * @param response callback Message

     */

    public void setAllowedNetworkTypes(@TelephonyManager.AllowedNetworkTypesReason int reason,

            @TelephonyManager.NetworkTypeBitMask long networkTypes, Message response) {

            @TelephonyManager.NetworkTypeBitMask long networkTypes, @Nullable Message response) {

        int subId = getSubId();

        if (!TelephonyManager.isValidAllowedNetworkTypesReason(reason)) {

            loge("setAllowedNetworkTypes: Invalid allowed network type reason: " + reason);

            if (response != null) {

                AsyncResult.forMessage(response, null,

                        new CommandException(CommandException.Error.INVALID_ARGUMENTS));

                response.sendToTarget();

            }

            return;

        }

        if (!SubscriptionManager.isUsableSubscriptionId(subId)

                || !mIsAllowedNetworkTypesLoadedFromDb) {

            loge("setAllowedNetworkTypes: no sim or network type is not loaded. SubscriptionId: "

                    + subId + ", isNetworkTypeLoaded" + mIsAllowedNetworkTypesLoadedFromDb);

            if (response != null) {

                AsyncResult.forMessage(response, null,

                        new CommandException(CommandException.Error.MISSING_RESOURCE));

                response.sendToTarget();

            }

            return;

        }

        String mapAsString = "";