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

Commit 24279e7e authored by Brett Chabot's avatar Brett Chabot Committed by android-build-merger
Browse files

resolve merge conflicts of 18900c46 to stage-aosp-master 

am: 0a4ceee1

Change-Id: I02998fc243f8d26aa3badda3c32cb65c237d317e
parents 97d67dff 0a4ceee1

packages/ExtServices/tests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ LOCAL_CERTIFICATE := platform 
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    mockito-target-minus-junit4 \

    espresso-core \

    androidx.test.espresso.core \

    truth-prebuilt \

    testables

packages/ExtServices/tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <uses-library android:name="android.test.runner" />

    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="android.ext.services"

                     android:label="ExtServices Test Cases">

    </instrumentation>

packages/ExtServices/tests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <option name="test-tag" value="ExtServicesUnitTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="android.ext.services.tests.unit" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>
 
 No newline at end of file

packages/ExtServices/tests/src/android/ext/services/notification/AssistantTest.java

+3 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; 
import static android.app.NotificationManager.IMPORTANCE_MIN;



import static junit.framework.Assert.assertEquals;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;
@@ -33,7 +34,6 @@ import android.app.INotificationManager; 
import android.app.Notification;

import android.app.NotificationChannel;

import android.content.ContentResolver;

import android.content.IContentProvider;

import android.content.Intent;

import android.os.UserHandle;

import android.provider.Settings;
@@ -43,11 +43,11 @@ import android.service.notification.NotificationListenerService.Ranking; 
import android.service.notification.NotificationListenerService.RankingMap;

import android.service.notification.NotificationStats;

import android.service.notification.StatusBarNotification;

import android.support.test.InstrumentationRegistry;

import android.test.ServiceTestCase;

import android.testing.TestableContext;

import android.util.AtomicFile;

import android.util.Xml;



import androidx.test.InstrumentationRegistry;



import com.android.internal.util.FastXmlSerializer;
@@ -57,7 +57,6 @@ import org.junit.Test; 
import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlSerializer;



import java.io.BufferedInputStream;

packages/NetworkStack/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ android_test { 
    test_suites: ["device-tests"],

    resource_dirs: ["res"],

    static_libs: [

        "android-support-test",

        "androidx.test.rules",

        "frameworks-base-testutils",

        "mockito-target-extended-minus-junit4",

        "NetworkStackLib",