Skip to content

Commit dc9903c

Browse files
author
Android Build Coastguard Worker
committed
Snap for 11169550 from d300178 to udc-d2-release
Change-Id: I6316e24376949da02fee37860b1e3d11f7f038c5
2 parents 7ac48f2 + d300178 commit dc9903c

10 files changed

Lines changed: 19 additions & 332 deletions

File tree

‎tests/tests/media/decoder/src/android/media/decoder/cts/DecodeOnlyTest.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
7575
public class DecodeOnlyTest extends MediaTestBase {
7676
public static final boolean WAS_LAUNCHED_ON_U_OR_LATER =
77-
SystemProperties.getInt("ro.board.first_api_level", Build.VERSION_CODES.CUR_DEVELOPMENT)
77+
SystemProperties.getInt("ro.product.first_api_level",
78+
Build.VERSION_CODES.CUR_DEVELOPMENT)
7879
>= Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
7980

8081
private static final String MEDIA_DIR_STRING = WorkDir.getMediaDirString();
@@ -108,7 +109,7 @@ public void tearDown() {
108109
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
109110
public void testTunneledPerfectSeekInitialPeekOnAvc() throws Exception {
110111
// Tunnel mode requires vendor support of the DECODE_ONLY feature
111-
Assume.assumeTrue("First board API level is not Android 14 or later.",
112+
Assume.assumeTrue("First API level is not Android 14 or later.",
112113
WAS_LAUNCHED_ON_U_OR_LATER);
113114
testTunneledPerfectSeek(AVC_VIDEO, true);
114115
}
@@ -117,7 +118,7 @@ public void testTunneledPerfectSeekInitialPeekOnAvc() throws Exception {
117118
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
118119
public void testTunneledPerfectSeekInitialPeekOnVp9() throws Exception {
119120
// Tunnel mode requires vendor support of the DECODE_ONLY feature
120-
Assume.assumeTrue("First board API level is not Android 14 or later.",
121+
Assume.assumeTrue("First API level is not Android 14 or later.",
121122
WAS_LAUNCHED_ON_U_OR_LATER);
122123
testTunneledPerfectSeek(VP9_VIDEO, true);
123124
}
@@ -126,7 +127,7 @@ public void testTunneledPerfectSeekInitialPeekOnVp9() throws Exception {
126127
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
127128
public void testTunneledPerfectSeekInitialPeekOnHevc() throws Exception {
128129
// Tunnel mode requires vendor support of the DECODE_ONLY feature
129-
Assume.assumeTrue("First board API level is not Android 14 or later.",
130+
Assume.assumeTrue("First API level is not Android 14 or later.",
130131
WAS_LAUNCHED_ON_U_OR_LATER);
131132
testTunneledPerfectSeek(HEVC_VIDEO, true);
132133
}
@@ -135,7 +136,7 @@ public void testTunneledPerfectSeekInitialPeekOnHevc() throws Exception {
135136
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
136137
public void testTunneledPerfectSeekInitialPeekOffAvc() throws Exception {
137138
// Tunnel mode requires vendor support of the DECODE_ONLY feature
138-
Assume.assumeTrue("First board API level is not Android 14 or later.",
139+
Assume.assumeTrue("First API level is not Android 14 or later.",
139140
WAS_LAUNCHED_ON_U_OR_LATER);
140141
testTunneledPerfectSeek(AVC_VIDEO, false);
141142
}
@@ -144,7 +145,7 @@ public void testTunneledPerfectSeekInitialPeekOffAvc() throws Exception {
144145
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
145146
public void testTunneledPerfectSeekInitialPeekOffVp9() throws Exception {
146147
// Tunnel mode requires vendor support of the DECODE_ONLY feature
147-
Assume.assumeTrue("First board API level is not Android 14 or later.",
148+
Assume.assumeTrue("First API level is not Android 14 or later.",
148149
WAS_LAUNCHED_ON_U_OR_LATER);
149150
testTunneledPerfectSeek(VP9_VIDEO, false);
150151
}
@@ -153,7 +154,7 @@ public void testTunneledPerfectSeekInitialPeekOffVp9() throws Exception {
153154
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
154155
public void testTunneledPerfectSeekInitialPeekOffHevc() throws Exception {
155156
// Tunnel mode requires vendor support of the DECODE_ONLY feature
156-
Assume.assumeTrue("First board API level is not Android 14 or later.",
157+
Assume.assumeTrue("First API level is not Android 14 or later.",
157158
WAS_LAUNCHED_ON_U_OR_LATER);
158159
testTunneledPerfectSeek(HEVC_VIDEO, false);
159160
}
@@ -165,7 +166,7 @@ public void testTunneledPerfectSeekInitialPeekOffHevc() throws Exception {
165166
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
166167
public void testTunneledTrickPlayHevc() throws Exception {
167168
// Tunnel mode requires vendor support of the DECODE_ONLY feature
168-
Assume.assumeTrue("First board API level is not Android 14 or later.",
169+
Assume.assumeTrue("First API level is not Android 14 or later.",
169170
WAS_LAUNCHED_ON_U_OR_LATER);
170171
testTunneledTrickPlay(HEVC_VIDEO);
171172
}
@@ -174,7 +175,7 @@ public void testTunneledTrickPlayHevc() throws Exception {
174175
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
175176
public void testTunneledTrickPlayAvc() throws Exception {
176177
// Tunnel mode requires vendor support of the DECODE_ONLY feature
177-
Assume.assumeTrue("First board API level is not Android 14 or later.",
178+
Assume.assumeTrue("First API level is not Android 14 or later.",
178179
WAS_LAUNCHED_ON_U_OR_LATER);
179180
testTunneledTrickPlay(AVC_VIDEO);
180181
}
@@ -183,7 +184,7 @@ public void testTunneledTrickPlayAvc() throws Exception {
183184
@ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
184185
public void testTunneledTrickPlayVp9() throws Exception {
185186
// Tunnel mode requires vendor support of the DECODE_ONLY feature
186-
Assume.assumeTrue("First board API level is not Android 14 or later.",
187+
Assume.assumeTrue("First API level is not Android 14 or later.",
187188
WAS_LAUNCHED_ON_U_OR_LATER);
188189
testTunneledTrickPlay(VP9_VIDEO);
189190
}

‎tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ public class DecoderTest extends MediaTestBase {
110110
private static final String REPORT_LOG_NAME = "CtsMediaDecoderTestCases";
111111

112112
public static final boolean WAS_LAUNCHED_ON_S_OR_LATER =
113-
SystemProperties.getInt("ro.board.first_api_level", Build.VERSION_CODES.CUR_DEVELOPMENT)
113+
SystemProperties.getInt("ro.product.first_api_level",
114+
Build.VERSION_CODES.CUR_DEVELOPMENT)
114115
>= Build.VERSION_CODES.S;
115116

116117
private static boolean IS_AT_LEAST_R = ApiLevelUtil.isAtLeast(Build.VERSION_CODES.R);
@@ -3531,7 +3532,7 @@ private void testTunneledVideoPeekOn(String mimeType, String videoName, float fr
35313532
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
35323533
public void testTunneledVideoPeekOnHevc() throws Exception {
35333534
// Requires vendor support of the TUNNEL_PEEK feature
3534-
Assume.assumeTrue("First board API level is not Android 12 or later.",
3535+
Assume.assumeTrue("First API level is not Android 12 or later.",
35353536
WAS_LAUNCHED_ON_S_OR_LATER);
35363537
testTunneledVideoPeekOn(MediaFormat.MIMETYPE_VIDEO_HEVC,
35373538
"video_1280x720_mkv_h265_500kbps_25fps_aac_stereo_128kbps_44100hz.mkv", 25);
@@ -3545,7 +3546,7 @@ public void testTunneledVideoPeekOnHevc() throws Exception {
35453546
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
35463547
public void testTunneledVideoPeekOnAvc() throws Exception {
35473548
// Requires vendor support of the TUNNEL_PEEK feature
3548-
Assume.assumeTrue("First board API level is not Android 12 or later.",
3549+
Assume.assumeTrue("First API level is not Android 12 or later.",
35493550
WAS_LAUNCHED_ON_S_OR_LATER);
35503551
testTunneledVideoPeekOn(MediaFormat.MIMETYPE_VIDEO_AVC,
35513552
"video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4", 25);
@@ -3559,7 +3560,7 @@ public void testTunneledVideoPeekOnAvc() throws Exception {
35593560
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
35603561
public void testTunneledVideoPeekOnVp9() throws Exception {
35613562
// Requires vendor support of the TUNNEL_PEEK feature
3562-
Assume.assumeTrue("First board API level is not Android 12 or later.",
3563+
Assume.assumeTrue("First API level is not Android 12 or later.",
35633564
WAS_LAUNCHED_ON_S_OR_LATER);
35643565
testTunneledVideoPeekOn(MediaFormat.MIMETYPE_VIDEO_VP9,
35653566
"bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm",
@@ -3632,7 +3633,7 @@ private void testTunneledVideoPeekOff(String mimeType, String videoName, float f
36323633
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
36333634
public void testTunneledVideoPeekOffHevc() throws Exception {
36343635
// Requires vendor support of the TUNNEL_PEEK feature
3635-
Assume.assumeTrue("First board API level is not Android 12 or later.",
3636+
Assume.assumeTrue("First API level is not Android 12 or later.",
36363637
WAS_LAUNCHED_ON_S_OR_LATER);
36373638
testTunneledVideoPeekOff(MediaFormat.MIMETYPE_VIDEO_HEVC,
36383639
"video_1280x720_mkv_h265_500kbps_25fps_aac_stereo_128kbps_44100hz.mkv", 25);
@@ -3646,7 +3647,7 @@ public void testTunneledVideoPeekOffHevc() throws Exception {
36463647
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
36473648
public void testTunneledVideoPeekOffAvc() throws Exception {
36483649
// Requires vendor support of the TUNNEL_PEEK feature
3649-
Assume.assumeTrue("First board API level is not Android 12 or later.",
3650+
Assume.assumeTrue("First API level is not Android 12 or later.",
36503651
WAS_LAUNCHED_ON_S_OR_LATER);
36513652
testTunneledVideoPeekOff(MediaFormat.MIMETYPE_VIDEO_AVC,
36523653
"video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4", 25);
@@ -3660,7 +3661,7 @@ public void testTunneledVideoPeekOffAvc() throws Exception {
36603661
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
36613662
public void testTunneledVideoPeekOffVp9() throws Exception {
36623663
// Requires vendor support of the TUNNEL_PEEK feature
3663-
Assume.assumeTrue("First board API level is not Android 12 or later.",
3664+
Assume.assumeTrue("First API level is not Android 12 or later.",
36643665
WAS_LAUNCHED_ON_S_OR_LATER);
36653666
testTunneledVideoPeekOff(MediaFormat.MIMETYPE_VIDEO_VP9,
36663667
"bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm",

‎tests/tests/security/Android.bp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ android_test {
9292
":CtsPermissionBackupAppCert34",
9393
":CtsPermissionBackupAppCert123",
9494
":CtsPermissionBackupAppCert4History124",
95-
":TileServiceNullBindingTestApp",
9695
],
9796
}
9897

‎tests/tests/security/AndroidTest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<option name="push" value="CtsPermissionBackupAppCert123.apk->/data/local/tmp/cts/security/CtsPermissionBackupAppCert123.apk" />
6464
<option name="push" value="CtsPermissionBackupAppCert34.apk->/data/local/tmp/cts/security/CtsPermissionBackupAppCert34.apk" />
6565
<option name="push" value="CtsPermissionBackupAppCert4History124.apk->/data/local/tmp/cts/security/CtsPermissionBackupAppCert4History124.apk" />
66-
<option name="push" value="TileServiceNullBindingTestApp.apk->/data/local/tmp/cts/security/TileServiceNullBindingTestApp.apk" />
6766
</target_preparer>
6867

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

‎tests/tests/security/TileServiceNullBindingTestApp/Android.bp‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎tests/tests/security/TileServiceNullBindingTestApp/AndroidManifest.xml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎tests/tests/security/TileServiceNullBindingTestApp/src/android/security/cts/tileservice/ActivityStarterActivity.kt‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎tests/tests/security/TileServiceNullBindingTestApp/src/android/security/cts/tileservice/BackgroundLaunchActivity.kt‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎tests/tests/security/TileServiceNullBindingTestApp/src/android/security/cts/tileservice/NullBindingTileService.kt‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)