Merge "MapClient: Handle remote exception at cleanup" am: 84351b4e am: 08dead49

     */

    void cleanUp() {

        clearMessages();

        try {

            mSubscriptionManager.removeSubscriptionInfoRecord(mDevice.getAddress(),

                    SubscriptionManager.SUBSCRIPTION_TYPE_REMOTE_SIM);

        } catch (Exception e) {

            Log.w(TAG, "cleanUp failed: " + e.toString());

        }

    }

    /**

     * clearMessages

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

        mMapClientContent.storeMessage(mTestMessage2, mTestMessage2Handle, mTestMessage1Timestamp);

    }

    /**

     * Test to validate that an exception in the Subscription manager won't crash Bluetooth during

     * disconnect.

     */

    @Test

    public void testCleanUpRemoteException() {

        mMapClientContent = new MapClientContent(mMockContext, mCallbacks, mTestDevice);

        doThrow(java.lang.NullPointerException.class).when(mMockSubscriptionManager)

                .removeSubscriptionInfoRecord(any(), anyInt());

        mMapClientContent.cleanUp();

    }

    void createTestMessages() {

        mOriginator = new VCardEntry();

        VCardProperty property = new VCardProperty();