diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-01-31 11:53:41 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-02-01 14:08:42 -0800 |
| commit | 88b45c586d461df38b866d529bc98d1dfa3e8838 (patch) | |
| tree | ae57a86275dac94c0899015923778f3016c865b2 /test-base/src/android/test/RepetitiveTest.java | |
| parent | 067596650927fa91a97355e84b152b21826f7ae2 (diff) | |
| parent | 9b9ca46fc2d3da231bf9ef6ff630105720f94cf2 (diff) | |
Merge QP1A.190122.001
Conflicts:
api/system-current.txt
core/java/android/bluetooth/BluetoothAdapter.java
core/jni/android_util_Process.cpp
core/jni/com_android_internal_os_Zygote.cpp
core/res/res/values/config.xml
core/res/res/values/symbols.xml
media/java/android/media/MediaCodecInfo.java
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/LocationManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
services/core/java/com/android/server/location/GnssLocationProvider.java
services/core/java/com/android/server/wm/ActivityStack.java
services/net/java/android/net/ip/IpClient.java
telecomm/java/android/telecom/Connection.java
telephony/java/android/telephony/ims/ImsCallSession.java
telephony/java/android/telephony/ims/ImsCallSessionListener.java
telephony/java/android/telephony/ims/aidl/IImsCallSessionListener.aidl
telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java
telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
wifi/java/android/net/wifi/WifiConfiguration.java
Change-Id: I367301986f2ae80a528050c3d78776b5a4c6b5ee
Diffstat (limited to 'test-base/src/android/test/RepetitiveTest.java')
| -rw-r--r-- | test-base/src/android/test/RepetitiveTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test-base/src/android/test/RepetitiveTest.java b/test-base/src/android/test/RepetitiveTest.java index 6a7130e68e61..13e89d2d92a6 100644 --- a/test-base/src/android/test/RepetitiveTest.java +++ b/test-base/src/android/test/RepetitiveTest.java @@ -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 * 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) @Retention(RetentionPolicy.RUNTIME) public @interface RepetitiveTest { @@ -37,4 +39,4 @@ public @interface RepetitiveTest { * @return The total number of iterations, the default is 1. */ int numIterations() default 1; -}
\ No newline at end of file +} |