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

Commit 8c4d24f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I16a302b5,I33f2ce58 

* changes:
  Migrate frameworks/base/apct-tests/perftests/core to androidx.test
  Introduce TextClassifierEventTronLogger
parents 82ae7f86 412796e5

apct-tests/perftests/core/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := \ 
  src/android/os/ISomeService.aidl

  src/android/os/ISomeService.aidl





LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    androidx.annotation_annotation \

    androidx.annotation_annotation \

    apct-perftests-utils \

    apct-perftests-utils \

    guava

    guava

apct-tests/perftests/core/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 




    </application>

    </application>





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

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

        android:targetPackage="com.android.perftests.core"/>

        android:targetPackage="com.android.perftests.core"/>





</manifest>
 
</manifest>

apct-tests/perftests/core/src/android/accounts/AccountManagerPerfTest.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -23,10 +23,10 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.support.test.InstrumentationRegistry;



import android.support.test.filters.LargeTest;

import androidx.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.filters.LargeTest;

import android.util.Log;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;

apct-tests/perftests/core/src/android/app/PendingIntentPerfTest.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -21,9 +21,10 @@ import android.content.Intent; 
import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.StubActivity;

import android.perftests.utils.StubActivity;

import android.support.test.InstrumentationRegistry;



import android.support.test.filters.LargeTest;

import androidx.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Rule;
@@ -33,7 +34,6 @@ import org.junit.runner.RunWith; 
// Due to b/71353150, you might get "java.lang.AssertionError: Binder ProxyMap has too many

// Due to b/71353150, you might get "java.lang.AssertionError: Binder ProxyMap has too many

// entries", but it's flaky. Adding "Runtime.getRuntime().gc()" between each iteration solves

// entries", but it's flaky. Adding "Runtime.getRuntime().gc()" between each iteration solves

// the problem, but it doesn't seem like it's currently needed.

// the problem, but it doesn't seem like it's currently needed.



@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@LargeTest

@LargeTest

public class PendingIntentPerfTest {

public class PendingIntentPerfTest {

apct-tests/perftests/core/src/android/app/ResourcesPerfTest.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,8 @@ import android.content.res.Resources; 
import android.content.res.XmlResourceParser;

import android.content.res.XmlResourceParser;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.support.test.filters.LargeTest;



import androidx.test.filters.LargeTest;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;