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

Commit 439d5e35 authored by Rambo Wang's avatar Rambo Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up flag cleanup_open_logical_channel_record_on_dispose" into main

parents e3403f07 c744a3b4

flags/uicc.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ flag { 
    bug:"318348580"

}



# OWNER=rambowang TARGET=24Q3

flag {

    name: "cleanup_open_logical_channel_record_on_dispose"

    namespace: "telephony"

    description: "This flag cleans up the OpenLogicalChannelRecord once SIM is removed"

    bug:"335046531"

}



# OWNER=arunvoddu TARGET=24Q4

flag {

    name: "set_carrier_restriction_status"

src/java/com/android/internal/telephony/uicc/UiccPort.java

+6 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.internal.telephony.IccLogicalChannelRequest; 
import com.android.internal.telephony.TelephonyComponentFactory;

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

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

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

import com.android.telephony.Rlog;



import java.io.FileDescriptor;
@@ -442,7 +441,6 @@ public class UiccPort { 
     * channel that may have been assigned to other client.

     */

    private void cleanupOpenLogicalChannelRecordsIfNeeded() {

        if (Flags.cleanupOpenLogicalChannelRecordOnDispose()) {

        synchronized (mOpenChannelRecords) {

            for (OpenLogicalChannelRecord record : mOpenChannelRecords) {

                if (DBG) log("Clean up " + record);
@@ -452,7 +450,6 @@ public class UiccPort { 
            mOpenChannelRecords.clear();

        }

    }

    }



    /** Record to keep open logical channel info. */

    @VisibleForTesting

tests/telephonytests/src/com/android/internal/telephony/uicc/UiccPortTest.java

+0 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.verify;



import android.os.Binder;

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

import android.telephony.TelephonyManager;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;
@@ -38,11 +37,9 @@ import androidx.test.filters.SmallTest; 


import com.android.internal.telephony.IccLogicalChannelRequest;

import com.android.internal.telephony.TelephonyTest;

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



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -61,13 +58,9 @@ public class UiccPortTest extends TelephonyTest { 


    private int mPhoneId = 0;



    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    @Before

    public void setUp() throws Exception {

        super.setUp(getClass().getSimpleName());

        mSetFlagsRule.enableFlags(Flags.FLAG_CLEANUP_OPEN_LOGICAL_CHANNEL_RECORD_ON_DISPOSE);

        mUiccCard = mock(UiccCard.class);

        mIccCardStatus = mock(IccCardStatus.class);

        /* initially there are no application available */