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

Commit 3c440580 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MapClient: Handle remote exception at cleanup" am: 712cb52b am: 6e8aa489 am: 0e772f51 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1665960

Change-Id: I814a66cc0c13e2315706fcaf464ac812ad36bab0
parents 24337653 0e772f51

android/app/src/com/android/bluetooth/mapclient/MapClientContent.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -389,10 +389,13 @@ class MapClientContent { 
     */

     */

    void cleanUp() {

    void cleanUp() {

        clearMessages();

        clearMessages();

        try {

            mSubscriptionManager.removeSubscriptionInfoRecord(mDevice.getAddress(),

            mSubscriptionManager.removeSubscriptionInfoRecord(mDevice.getAddress(),

                    SubscriptionManager.SUBSCRIPTION_TYPE_REMOTE_SIM);

                    SubscriptionManager.SUBSCRIPTION_TYPE_REMOTE_SIM);

        } catch (Exception e) {

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

        }

    }

    }







    /**

    /**

     * clearMessages

     * clearMessages

android/app/tests/unit/src/com/android/bluetooth/mapclient/MapClientContentTest.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.bluetooth.mapclient; 




import static org.mockito.Mockito.any;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;
@@ -324,6 +325,18 @@ public class MapClientContentTest { 
        mMapClientContent.storeMessage(mTestMessage2, mTestMessage2Handle, mTestMessage1Timestamp);

        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() {

    void createTestMessages() {

        mOriginator = new VCardEntry();

        mOriginator = new VCardEntry();

        VCardProperty property = new VCardProperty();

        VCardProperty property = new VCardProperty();