diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-17 21:01:03 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-17 21:01:03 +0000 |
| commit | 57c65a9ba57ac0a3b617c068fff1a93da4cec675 (patch) | |
| tree | a64339ff515279e953c8b376e9aaa33d80bda461 | |
| parent | 8cd570fdcdafa02cf99111a6fd4dac1d947a4ae6 (diff) | |
| parent | 4b197f7664b9e5e7b9fd3beb12f43f9385f3df10 (diff) | |
| download | cts-android-security-14.0.0_r1.tar.gz | |
Snap for 10342804 from 4b197f7664b9e5e7b9fd3beb12f43f9385f3df10 to udc-releaseandroid-security-14.0.0_r1
Change-Id: Ic2707a11b7bcfd8cbc1832ca5a859749962425c7
| -rw-r--r-- | apps/CameraITS/utils/video_processing_utils.py | 5 | ||||
| -rw-r--r-- | apps/CtsVerifier/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | hostsidetests/harmfulappwarning/OWNERS | 6 | ||||
| -rw-r--r-- | tests/tests/deviceconfig/Android.bp | 4 | ||||
| -rwxr-xr-x | tests/tests/deviceconfig/AndroidManifest.xml | 1 |
5 files changed, 14 insertions, 11 deletions
diff --git a/apps/CameraITS/utils/video_processing_utils.py b/apps/CameraITS/utils/video_processing_utils.py index a8181b36eb4..e584c3c09cb 100644 --- a/apps/CameraITS/utils/video_processing_utils.py +++ b/apps/CameraITS/utils/video_processing_utils.py @@ -298,12 +298,13 @@ def get_frame_deltas(video_file_name_with_path, timestamp_type='pts'): if raw_output: output = str(raw_output.decode('utf-8')).strip().split('\n') deltas = [] - prev_time = 0 + prev_time = None for line in output: if timestamp_type not in line: continue curr_time = float(re.search(r'time= *([0-9][0-9\.]*)', line).group(1)) - deltas.append(curr_time - prev_time) + if prev_time is not None: + deltas.append(curr_time - prev_time) prev_time = curr_time logging.debug('Frame deltas: %s', deltas) return deltas diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml index e8c5700480d..1afdc48a7d4 100644 --- a/apps/CtsVerifier/res/values/strings.xml +++ b/apps/CtsVerifier/res/values/strings.xml @@ -5759,9 +5759,9 @@ You should be prompted to select credentials; choose the ones you just installed This time is defined as the \"cold start latency\". To pass this test, a maximum cold start latency time of 500ms or less is REQUIRED, while a time of 100ms or less is STRONGLY RECOMMENDED. (See <a href="https://source.android.com/compatibility/android-cdd#5_6_audio_latency">Android CDD ยง 5.6. Audio Latency</a>) - \n\nTo run this test, it is required to have touch-sounds disabled in the device - \"Sound & Vibration\" settings - panel. + \n\nTo run this test, it is required to have Tap & click sounds disabled in the device + \"Sound & Vibration\" settings panel. Note that in some versions of Android, this setting + may be called \"Touch sounds\". \n\nThe \"Java API\" and \"Native API\" allow for capturing performance data from the two streaming APIs. The cold start latency measurement need only pass for one API. The Native API generally gives the best performance. @@ -5786,7 +5786,8 @@ You should be prompted to select credentials; choose the ones you just installed <string name="audio_coldstart_outputlbl">Output Cold Start Latency</string> <string name="audio_coldstart_inputlbl">Input Cold Start Latency</string> <string name="audio_coldstart_touchsounds_message"> - Touch sounds are ENABLED. Please DISABLE touch sounds in the \"Sound & Vibration\" settings panel. + Tap & click sounds are ENABLED. Please DISABLE Tap & click in the \"Sound & Vibration\" settings panel. + \nNote that in some versions of Android, this setting may be called \"Touch sounds\". </string> <string name="audio_coldstart_notouchsounds_message">Touch sound are DISABLED.</string> diff --git a/hostsidetests/harmfulappwarning/OWNERS b/hostsidetests/harmfulappwarning/OWNERS index f63363a724d..e9b94571bdc 100644 --- a/hostsidetests/harmfulappwarning/OWNERS +++ b/hostsidetests/harmfulappwarning/OWNERS @@ -1,2 +1,4 @@ -# Bug component: 99546 -bgruv@google.com
\ No newline at end of file +# Bug component: 162625 +ngbravo@google.com +pvisontay@google.com +gabrielhuff@google.com diff --git a/tests/tests/deviceconfig/Android.bp b/tests/tests/deviceconfig/Android.bp index d93870edfc8..8b90258733a 100644 --- a/tests/tests/deviceconfig/Android.bp +++ b/tests/tests/deviceconfig/Android.bp @@ -35,6 +35,6 @@ android_test { ], srcs: ["src/**/*.java"], sdk_version: "test_current", - min_sdk_version: "UpsideDownCake", - target_sdk_version: "UpsideDownCake", + min_sdk_version: "34", + target_sdk_version: "34", } diff --git a/tests/tests/deviceconfig/AndroidManifest.xml b/tests/tests/deviceconfig/AndroidManifest.xml index 1dae8a867bd..eafb00a72e3 100755 --- a/tests/tests/deviceconfig/AndroidManifest.xml +++ b/tests/tests/deviceconfig/AndroidManifest.xml @@ -18,7 +18,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android.deviceconfig.cts" android:targetSandboxVersion="2"> - <uses-sdk android:minSdkVersion="UpsideDownCake" android:targetSdkVersion="UpsideDownCake" /> <application> <uses-library android:name="android.test.runner" /> </application> |