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

Commit 93ae41f0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6477313 from 9e11310f to rvc-release 

Change-Id: I867e46e90795ef5a6ab4bc9bbf03b9b3b2947397
parents bc461c9c 9e11310f

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

+6 −3
Original line number Diff line number Diff line
@@ -190,11 +190,12 @@ public class IccPhoneBookInterfaceManager { 
            if (mAdnCache != null) {

                mAdnCache.updateAdnBySearch(efid, oldAdn, newAdn, pin2, response);

                waitForResult(updateRequest);

                return (boolean) updateRequest.mResult;

            } else {

                loge("Failure while trying to update by search due to uninitialised adncache");

                return false;

            }

        }

        return (boolean) updateRequest.mResult;

    }



    /**
@@ -239,11 +240,12 @@ public class IccPhoneBookInterfaceManager { 
            if (mAdnCache != null) {

                mAdnCache.updateAdnByIndex(efid, newAdn, index, pin2, response);

                waitForResult(updateRequest);

                return (boolean) updateRequest.mResult;

            } else {

                loge("Failure while trying to update by index due to uninitialised adncache");

                return false;

            }

        }

        return (boolean) updateRequest.mResult;

    }



    /**
@@ -301,11 +303,12 @@ public class IccPhoneBookInterfaceManager { 
            if (mAdnCache != null) {

                mAdnCache.requestLoadAllAdnLike(efid, mAdnCache.extensionEfForEf(efid), response);

                waitForResult(loadRequest);

                return (List<AdnRecord>) loadRequest.mResult;

            } else {

                loge("Failure while trying to load from SIM due to uninitialised adncache");

                return null;

            }

        }

        return (List<AdnRecord>) loadRequest.mResult;

    }



    @UnsupportedAppUsage

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

+2 −1
Original line number Diff line number Diff line
@@ -822,7 +822,8 @@ public class MultiSimSettingController extends Handler { 
            EuiccManager euiccManager = (EuiccManager)

                    mContext.getSystemService(Context.EUICC_SERVICE);

            euiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID,

                    PendingIntent.getService(mContext, 0, new Intent(), 0));

                    PendingIntent.getService(

                            mContext, 0, new Intent(), PendingIntent.FLAG_IMMUTABLE));

        }

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -351,11 +351,6 @@ public class NetworkTypeController extends StateMachine { 
    }



    private @Annotation.OverrideNetworkType int getNrDisplayType() {

        // Don't show 5G icon if preferred network type does not include 5G

        if ((mTelephonyManager.getPreferredNetworkTypeBitmask()

                & TelephonyManager.NETWORK_TYPE_BITMASK_NR) == 0) {

            return TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE;

        }

        // Icon display keys in order of priority

        List<String> keys = new ArrayList<>();

        // TODO: Update for NR SA

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

+17 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.telephony;



import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.telephony.TelephonyManager.MULTISIM_ALLOWED;

import static android.telephony.TelephonyManager.SET_OPPORTUNISTIC_SUB_REMOTE_SERVICE_EXCEPTION;

import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;
@@ -3725,7 +3726,22 @@ public class SubscriptionController extends ISub.Stub { 
            // We need to send intents to Euicc if we are turning on an inactive slot.

            // Euicc will decide whether to ask user to switch to DSDS, or change SIM

            // slot mapping.

            EuiccManager euiccManager =

                    (EuiccManager) mContext.getSystemService(Context.EUICC_SERVICE);

            if (euiccManager != null && euiccManager.isEnabled()) {

                enableSubscriptionOverEuiccManager(subId, enable, physicalSlotIndex);

            } else {

                // Enable / disable uicc applications.

                if (!info.areUiccApplicationsEnabled()) setUiccApplicationsEnabled(enable, subId);

                // If euiccManager is not enabled, we try to switch to DSDS if possible,

                // or switch slot if not.

                if (mTelephonyManager.isMultiSimSupported() == MULTISIM_ALLOWED) {

                    PhoneConfigurationManager.getInstance().switchMultiSimConfig(

                            mTelephonyManager.getSupportedModemCount());

                } else {

                    UiccController.getInstance().switchSlots(new int[]{physicalSlotIndex}, null);

                }

            }

            return true;

        } else {

            // Enable / disable uicc applications.

tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


        replaceInstance(Handler.class, "mLooper", mDisplayInfoController, Looper.myLooper());

        mNetworkTypeController = new NetworkTypeController(mPhone, mDisplayInfoController);

        doReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR)

                .when(mTelephonyManager).getPreferredNetworkTypeBitmask();

    }



    @After