Merge "Use CloseGuard to catch UiccPort resource leaks" into main

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

import com.android.telephony.Rlog;

import dalvik.system.CloseGuard;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

    // The lock object is created by UiccSlot that owns this UiccCard - this is to share the lock

    // between UiccSlot, UiccCard, EuiccCard, UiccPort, EuiccPort and UiccProfile for now.

    protected final Object mLock;

    private final CloseGuard mCloseGuard = CloseGuard.get();

    private String mIccid;

    protected String mCardId;

        if (DBG) log("Creating");

        mPhoneId = phoneId;

        mLock = lock;

        mCloseGuard.open("cleanup");

        update(c, ci, ics, uiccCard);

    }

    public void dispose() {

        synchronized (mLock) {

            if (DBG) log("Disposing Port");

            mCloseGuard.close();

            if (mUiccProfile != null) {

                mUiccProfile.dispose();

            }

    }

    @Override

    protected void finalize() {

    protected void finalize() throws Throwable {

        if (DBG) log("UiccPort finalized");

        try {

            if (mCloseGuard != null) mCloseGuard.warnIfOpen();

            cleanupOpenLogicalChannelRecordsIfNeeded();

        } finally {

            super.finalize();

        }

    }

    /**