merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 953a1dd..2ef9b62 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -113,6 +113,7 @@
CtsAdminTestCases \
CtsAnimationTestCases \
CtsAppTestCases \
+ CtsAppWidgetTestCases \
CtsBluetoothTestCases \
CtsCalendarcommon2TestCases \
CtsContentTestCases \
diff --git a/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py b/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py
index 2c311f8..9b43a74 100644
--- a/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py
+++ b/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py
@@ -36,7 +36,13 @@
its.caps.per_frame_control(props) and
its.caps.ev_compensation(props))
- evs = range(-4,5)
+ ev_compensation_range = props['android.control.aeCompensationRange']
+ range_min = ev_compensation_range[0]
+ range_max = ev_compensation_range[1]
+ ev_per_step = its.objects.rational_to_float(
+ props['android.control.aeCompensationStep'])
+ steps_per_ev = int(1.0 / ev_per_step)
+ evs = range(range_min, range_max + 1, steps_per_ev)
lumas = []
for ev in evs:
# Re-converge 3A, and lock AE once converged. skip AF trigger as
@@ -59,10 +65,8 @@
tile = its.image.get_image_patch(y, 0.45,0.45,0.1,0.1)
lumas.append(its.image.compute_image_means(tile)[0])
- ev_step_size_in_stops = its.objects.rational_to_float(
- props['android.control.aeCompensationStep'])
- luma_increase_per_step = pow(2, ev_step_size_in_stops)
- print "ev_step_size_in_stops", ev_step_size_in_stops
+ luma_increase_per_step = pow(2, ev_per_step)
+ print "ev_step_size_in_stops", ev_per_step
imid = len(lumas) / 2
expected_lumas = [lumas[imid] / pow(luma_increase_per_step, i)
for i in range(imid , 0, -1)] + \
diff --git a/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py b/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py
index 30f1df2..d09f2fd 100644
--- a/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py
+++ b/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py
@@ -31,7 +31,10 @@
props = cam.get_camera_properties()
its.caps.skip_unless(its.caps.ev_compensation(props))
- evs = range(-4,5)
+ ev_per_step = its.objects.rational_to_float(
+ props['android.control.aeCompensationStep'])
+ steps_per_ev = int(1.0 / ev_per_step)
+ evs = range(-2 * steps_per_ev, 2 * steps_per_ev + 1, steps_per_ev)
lumas = []
for ev in evs:
# Re-converge 3A, and lock AE once converged. skip AF trigger as
@@ -51,6 +54,11 @@
pylab.plot(evs, lumas, 'r')
matplotlib.pyplot.savefig("%s_plot_means.png" % (NAME))
+ # trim trailing 1.0s (for saturated image)
+ while lumas and lumas[-1] == 1.0:
+ lumas.pop(-1)
+ # Only allow positive EVs to give saturated image
+ assert(len(lumas) > 2)
luma_diffs = numpy.diff(lumas)
min_luma_diffs = min(luma_diffs)
print "Min of the luma value difference between adjacent ev comp: ", \
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index 105e92b..36acf42 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -221,7 +221,7 @@
new Feature(PackageManager.FEATURE_VERIFIED_BOOT, false),
// Features explicitly made optional in L
- new Feature("PackageManager.FEATURE_LOCATION_NETWORK", false),
+ new Feature(PackageManager.FEATURE_LOCATION_NETWORK, false),
// New hidden features in L
new Feature("android.hardware.ethernet", false),
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
index fa233e8..9684d97 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
@@ -119,30 +119,30 @@
new Stream("H263 Video, AMR Audio", "http_h263_amr",
"http://redirector.c.play.google.com/"
+ "videoplayback?id=271de9756065677e"
- + "&itag=13&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=372FA4C532AA49D14EAF049BCDA66460EEE161E9"
- + ".6D8BF096B73B7A68A7032CA8685053CFB498D30A"
+ + "&itag=13&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ + "&sparams=ip,ipbits,expire,id,itag"
+ + "&signature=073A731E2BDF1E05206AC7B9B895C922ABCBA01D"
+ + ".1DDA3F999541D2136E6755F16FC44CA972767169"
+ "&source=youtube"
- + "&key=test_key1&user=android-device-test"),
+ + "&key=ik0&user=android-device-test"),
new Stream("MPEG4 SP Video, AAC Audio", "http_mpeg4_aac",
"http://redirector.c.play.google.com/"
+ "videoplayback?id=271de9756065677e"
- + "&itag=17&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=3DCD3F79E045F95B6AF661765F046FB0440FF016"
- + ".06A42661B3AF6BAF046F012549CC9BA34EBC80A9"
+ + "&itag=17&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ + "&sparams=ip,ipbits,expire,id,itag"
+ + "&signature=6B0F8B8A6A7FD9E4CDF123349C2E061ED2020D74"
+ + ".3460FC81D6C8894BA2D241597D2E1D059845F5F0"
+ "&source=youtube"
- + "&key=test_key1&user=android-device-test"),
+ + "&key=ik0&user=android-device-test"),
new Stream("H264 Base Video, AAC Audio", "http_h264_aac",
"http://redirector.c.play.google.com/"
+ "videoplayback?id=271de9756065677e"
- + "&itag=18&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=1219C2B07AF0638C27916307A6093C0E43CB894E"
- + ".126B6B916BD57157782738AA7C03E59F21DBC168"
+ + "&itag=18&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ + "&sparams=ip,ipbits,expire,id,itag"
+ + "&signature=75627CD4CEA73D7868CBDE3CE5C4011955164107"
+ + ".1DCFB0EF1372B48DDCFBE69645FE137AC02AF561"
+ "&source=youtube"
- + "&key=test_key1&user=android-device-test"),
+ + "&key=ik0&user=android-device-test"),
};
@Override
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
index 0ae36c7..4c07482 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
@@ -172,10 +172,10 @@
playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
+ "&itag=160&source=youtube&user=android-device-test"
+ "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&signature=341692D20FACCAE25B90EA2C131EA6ADCD8E2384."
- + "9EB08C174BE401AAD20FB85EE4DBA51A2882BB60"
- + "&key=test_key1", 256, 144, PLAY_TIME_MS);
+ + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ + "&signature=9EDCA0B395B8A949C511FD5E59B9F805CFF797FD."
+ + "702DE9BA7AF96785FD6930AD2DD693A0486C880E"
+ + "&key=ik0", 256, 144, PLAY_TIME_MS);
}
public void testAvcBaseline30() throws Exception {
@@ -185,10 +185,10 @@
playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
+ "&itag=18&source=youtube&user=android-device-test"
+ "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&signature=8701A45F6422229D46ABB25A22E2C00C94024606."
- + "08BCDF16C3F744C49D4C8A8AD1C38B3DC1810918"
- + "&key=test_key1", 640, 360, PLAY_TIME_MS);
+ + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ + "&signature=7DCDE3A6594D0B91A27676A3CDC3A87B149F82EA."
+ + "7A83031734CB1EDCE06766B6228842F954927960"
+ + "&key=ik0", 640, 360, PLAY_TIME_MS);
}
public void testAvcHigh31() throws Exception {
@@ -198,11 +198,10 @@
playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
+ "&itag=22&source=youtube&user=android-device-test"
+ "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&signature=42969CA8F7FFAE432B7135BC811F96F7C4172C3F."
- + "1A8A92EA714C1B7C98A05DDF2DE90854CDD7638B"
- + "&key=test_key1", 1280, 720, PLAY_TIME_MS);
-
+ + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ + "&signature=179525311196616BD8E1381759B0E5F81A9E91B5."
+ + "C4A50E44059FEBCC6BBC78E3B3A4E0E0065777"
+ + "&key=ik0", 1280, 720, PLAY_TIME_MS);
}
public void testAvcHigh40() throws Exception {
@@ -216,10 +215,10 @@
playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
+ "&itag=137&source=youtube&user=android-device-test"
+ "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&signature=2C836E04C4DDC98649CD44C8B91813D98342D1D1."
- + "870A848D54CA08C197E5FDC34ED45E6ED7DB5CDA"
- + "&key=test_key1", 1920, 1080, PLAY_TIME_MS);
+ + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ + "&signature=B0976085596DD42DEA3F08307F76587241CB132B."
+ + "043B719C039E8B92F45391ADC0BE3665E2332930"
+ + "&key=ik0", 1920, 1080, PLAY_TIME_MS);
}
public void testHevcMain1() throws Exception {
diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
index 748cda7..dd7c1f6 100644
--- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
@@ -72,9 +72,9 @@
playVideoTest("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
+ "&itag=13&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=6F5AEC448AAF88466D7A10EBB76020745405D33F."
- + "5050D35AE997E1535FE828B0DE99EF31A699D9D0"
- + "&key=test_key1&user=android-device-test", 176, 144);
+ + "&signature=5729247E22691EBB3E804DDD523EC42DC17DD8CE"
+ + ".443B81C1E8E6D64E4E1555F568BA46C206507D78"
+ + "&key=ik0&user=android-device-test", 176, 144);
}
public void testHTTP_H263_AMR_Video2() throws Exception {
if (!MediaUtils.checkDecoder(MediaFormat.MIMETYPE_VIDEO_H263, MediaFormat.MIMETYPE_AUDIO_AMR_NB)) {
@@ -84,9 +84,9 @@
playVideoTest("http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
+ "&itag=13&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=71749754E28115FD1C233E3BE96CDDC3F430CB74."
- + "49D1506DE694CC8FCEE63CB4F3AD41EB76C198CE"
- + "&key=test_key1&user=android-device-test", 176, 144);
+ + "&signature=508D82AB36939345BF6B8D0623CB6CABDD9C64C3"
+ + ".9B3336A96846DF38E5343C46AA57F6CF2956E427"
+ + "&key=ik0&user=android-device-test", 176, 144);
}
public void testHTTP_MPEG4SP_AAC_Video1() throws Exception {
@@ -97,9 +97,9 @@
playVideoTest("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
+ "&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=197A9742C1EFCA95725F2F26DFFD512FC48C149F."
- + "A59B42FD490F6B591B292F3B2659A9723B980351"
- + "&key=test_key1&user=android-device-test", 176, 144);
+ + "&signature=837198AAADF6F36BA6B2D324F690A7C5B7AFE3FF"
+ + ".7138CE5E36D718220726C1FC305497FF2D082249"
+ + "&key=ik0&user=android-device-test", 176, 144);
}
public void testHTTP_MPEG4SP_AAC_Video2() throws Exception {
if (!MediaUtils.checkDecoder(MediaFormat.MIMETYPE_VIDEO_MPEG4)) {
@@ -109,9 +109,9 @@
playVideoTest("http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
+ "&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=0F84740A7E06F884127E78A6D7DE6DEA8F4B8BFD."
- + "248DF1E90B8137C30769C79BF23147F6BB3DFCDF"
- + "&key=test_key1&user=android-device-test", 176, 144);
+ + "&signature=70E979A621001201BC18622BDBF914FA870BDA40"
+ + ".6E78890B80F4A33A18835F775B1FF64F0A4D0003"
+ + "&key=ik0&user=android-device-test", 176, 144);
}
public void testHTTP_H264Base_AAC_Video1() throws Exception {
@@ -122,9 +122,9 @@
playVideoTest("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
+ "&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=3CFCAFB87EB9FC943FACDC54FEC8C725A801642C."
- + "7D77ACBC4CAF40349BF093E302B635757E45F345"
- + "&key=test_key1&user=android-device-test", 640, 360);
+ + "&signature=667AEEF54639926662CE62361400B8F8C1753B3F"
+ + ".15F46C382C68A9F121BA17BF1F56BEDEB4B06091"
+ + "&key=ik0&user=android-device-test", 640, 360);
}
public void testHTTP_H264Base_AAC_Video2() throws Exception {
if (!MediaUtils.checkDecoder(MediaFormat.MIMETYPE_VIDEO_AVC)) {
@@ -134,9 +134,9 @@
playVideoTest("http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
+ "&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
+ "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=A11D8BA0AA67A27F1409BE0C0B96B756625DB88B."
- + "9BF4C93A130583ADBDF2B953AD5A8A58F518B012"
- + "&key=test_key1&user=android-device-test", 640, 360);
+ + "&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26"
+ + ".49582D382B4A9AFAA163DED38D2AE531D85603C0"
+ + "&key=ik0&user=android-device-test", 640, 360);
}
// Streaming HLS video from YouTube
