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

Commit 85a910ba authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Revert "Disable MapClientContentTest when sms is not supported"" am:... 

Merge "Revert "Disable MapClientContentTest when sms is not supported"" am: ab3413c2 am: 08f5341d

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



Change-Id: I5d700f19f42f9ab6750574fd5bd41ef5f0d32b03
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b711cdbb 08f5341d

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

+0 −5
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.Bundle; 
import android.os.Handler;

import android.provider.Telephony.Mms;

import android.provider.Telephony.Sms;

import android.telephony.SmsManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.test.mock.MockContentProvider;
@@ -56,7 +55,6 @@ import com.android.vcard.VCardProperty; 


import org.junit.After;

import org.junit.Assert;

import org.junit.Assume;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -111,7 +109,6 @@ public class MapClientContentTest { 
    private FakeContentProvider mMockSmsContentProvider;

    private FakeContentProvider mMockMmsContentProvider;

    private FakeContentProvider mMockThreadContentProvider;

    private SmsManager mSmsManager = SmsManager.getDefault();



    @Mock

    private SubscriptionManager mMockSubscriptionManager;
@@ -120,8 +117,6 @@ public class MapClientContentTest { 


    @Before

    public void setUp() throws Exception {

        // Do not run test if sms is not supported

        Assume.assumeTrue(mSmsManager.isImsSmsSupported());

        MockitoAnnotations.initMocks(this);

        mTargetContext = InstrumentationRegistry.getTargetContext();