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

Commit 98248bd3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Clean up flag fix_crash_on_getting_config_when_phone_is_gone" into main

parents 9946c950 9b30873b

services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java

+2 −6
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.util.Slog; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting.Visibility;

import com.android.internal.telephony.flags.Flags;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper;
@@ -324,10 +323,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { 
        if (SubscriptionManager.isValidSubscriptionId(subId)) {

            // Get only configs as needed to save memory.

            final PersistableBundle carrierConfig =

                    Flags.fixCrashOnGettingConfigWhenPhoneIsGone()

                            ? CarrierConfigManager.getCarrierConfigSubset(mContext, subId,

                                    VcnManager.VCN_RELATED_CARRIER_CONFIG_KEYS)

                            : mCarrierConfigManager.getConfigForSubId(subId,

                    CarrierConfigManager.getCarrierConfigSubset(mContext, subId,

                            VcnManager.VCN_RELATED_CARRIER_CONFIG_KEYS);

            if (mDeps.isConfigForIdentifiedCarrier(carrierConfig)) {

                mReadySubIdsBySlotId.put(slotId, subId);

tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java

+0 −7
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import android.os.HandlerExecutor; 
import android.os.ParcelUuid;

import android.os.PersistableBundle;

import android.os.test.TestLooper;

import android.platform.test.flag.junit.SetFlagsRule;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;
@@ -73,10 +72,7 @@ import android.util.ArraySet; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.telephony.flags.Flags;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -133,8 +129,6 @@ public class TelephonySubscriptionTrackerTest { 
        TEST_SUBID_TO_CARRIER_CONFIG_MAP = Collections.unmodifiableMap(subIdToCarrierConfigMap);

    }



    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();





    @NonNull private final Context mContext;

    @NonNull private final TestLooper mTestLooper;
@@ -193,7 +187,6 @@ public class TelephonySubscriptionTrackerTest { 


    @Before

    public void setUp() throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_FIX_CRASH_ON_GETTING_CONFIG_WHEN_PHONE_IS_GONE);

        doReturn(2).when(mTelephonyManager).getActiveModemCount();



        mCallback = mock(TelephonySubscriptionTrackerCallback.class);