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

Commit a8021a39 authored by Sundong Ahn's avatar Sundong Ahn Committed by android-build-merger
Browse files

Merge "Add public API" am: e1e03960 

am: 7925837b

Change-Id: I39decc0e8108d9fe4d0ea9f362e1e0697c9a0b91
parents 87d8e82e 7925837b

config/hiddenapi-greylist.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -1568,7 +1568,6 @@ Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telepho 
Landroid/test/AndroidTestCase;->getTestContext()Landroid/content/Context;

Landroid/test/AndroidTestCase;->getTestContext()Landroid/content/Context;

Landroid/test/AndroidTestCase;->setTestContext(Landroid/content/Context;)V

Landroid/test/AndroidTestCase;->setTestContext(Landroid/content/Context;)V

Landroid/test/InstrumentationTestCase;->runMethod(Ljava/lang/reflect/Method;I)V

Landroid/test/InstrumentationTestCase;->runMethod(Ljava/lang/reflect/Method;I)V

Landroid/test/RepetitiveTest;->numIterations()I

Landroid/util/Singleton;-><init>()V

Landroid/util/Singleton;-><init>()V

Landroid/util/XmlPullAttributes;-><init>(Lorg/xmlpull/v1/XmlPullParser;)V

Landroid/util/XmlPullAttributes;-><init>(Lorg/xmlpull/v1/XmlPullParser;)V

Landroid/util/XmlPullAttributes;->mParser:Lorg/xmlpull/v1/XmlPullParser;

Landroid/util/XmlPullAttributes;->mParser:Lorg/xmlpull/v1/XmlPullParser;

test-base/api/current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,9 @@ package android.test { 
    method public abstract void startTiming(boolean);

    method public abstract void startTiming(boolean);

  }

  }





  public abstract deprecated class RepetitiveTest implements java.lang.annotation.Annotation {

  }



  public abstract deprecated class UiThreadTest implements java.lang.annotation.Annotation {

  public abstract deprecated class UiThreadTest implements java.lang.annotation.Annotation {

  }

  }

test-base/src/android/test/RepetitiveTest.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -26,8 +26,10 @@ import java.lang.annotation.Target; 
 * When the annotation is present, the test method is executed the number of times specified by

 * When the annotation is present, the test method is executed the number of times specified by

 * numIterations and defaults to 1.

 * numIterations and defaults to 1.

 *

 *

 * {@hide} Not needed for public API.

 * @deprecated New tests should be written using the

 * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.

 */

 */

@Deprecated

@Target(ElementType.METHOD)

@Target(ElementType.METHOD)

@Retention(RetentionPolicy.RUNTIME)

@Retention(RetentionPolicy.RUNTIME)

public @interface RepetitiveTest {

public @interface RepetitiveTest {