diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-20 06:39:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-20 06:39:22 +0000 |
| commit | 128de789f062d3cece961bfcf7b495a3568ad617 (patch) | |
| tree | 4bec58958fd5e2b3aa3562e86554671cf4dc0fd1 | |
| parent | 07e444ad8937e471a05cd9d37229d304aacd23b6 (diff) | |
| parent | dc13d19e997973adddeed5ac1247267f16a65baf (diff) | |
| download | cts-128de789f062d3cece961bfcf7b495a3568ad617.tar.gz | |
Merge cherrypicks of [15636132, 15634622, 15636419, 15634623, 15635081, 15636346, 15636347, 15635821, 15635822, 15635823, 15635824, 15636496, 15636421, 15635984, 15636005, 15636133, 15635225, 15635189, 15636250, 15636380, 15636422, 15636348, 15636349, 15636350, 15632848, 15636382, 15636383, 15636266, 15636351, 15636423, 15636352, 15635986, 15636220, 15636252] into sc-d1-release
Change-Id: Ib86409dfa0f3064f5aa04d066c03e2e9cb773e8a
| -rw-r--r-- | apps/CameraITS/tests/scene2_d/scene2_d.png | bin | 1213224 -> 1166196 bytes | |||
| -rw-r--r-- | apps/CameraITS/tests/scene2_d/scene2_d_0.5x_scaled.png | bin | 353367 -> 332386 bytes | |||
| -rw-r--r-- | apps/CameraITS/tests/scene2_d/scene2_d_0.67x_scaled.png | bin | 553007 -> 532056 bytes | |||
| -rw-r--r-- | apps/CameraITS/tests/scene2_e/scene2_e.png | bin | 950649 -> 1300496 bytes | |||
| -rw-r--r-- | apps/CameraITS/tests/scene2_e/scene2_e_0.5x_scaled.png | bin | 288219 -> 367924 bytes | |||
| -rw-r--r-- | apps/CameraITS/tests/scene2_e/scene2_e_0.67x_scaled.png | bin | 446635 -> 582664 bytes | |||
| -rw-r--r-- | tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java | 2 |
7 files changed, 2 insertions, 0 deletions
diff --git a/apps/CameraITS/tests/scene2_d/scene2_d.png b/apps/CameraITS/tests/scene2_d/scene2_d.png Binary files differindex e2a33e7b489..5365f3fb19d 100644 --- a/apps/CameraITS/tests/scene2_d/scene2_d.png +++ b/apps/CameraITS/tests/scene2_d/scene2_d.png diff --git a/apps/CameraITS/tests/scene2_d/scene2_d_0.5x_scaled.png b/apps/CameraITS/tests/scene2_d/scene2_d_0.5x_scaled.png Binary files differindex df700c3893d..21b068bf382 100644 --- a/apps/CameraITS/tests/scene2_d/scene2_d_0.5x_scaled.png +++ b/apps/CameraITS/tests/scene2_d/scene2_d_0.5x_scaled.png diff --git a/apps/CameraITS/tests/scene2_d/scene2_d_0.67x_scaled.png b/apps/CameraITS/tests/scene2_d/scene2_d_0.67x_scaled.png Binary files differindex 672ea303443..30d6813bc31 100644 --- a/apps/CameraITS/tests/scene2_d/scene2_d_0.67x_scaled.png +++ b/apps/CameraITS/tests/scene2_d/scene2_d_0.67x_scaled.png diff --git a/apps/CameraITS/tests/scene2_e/scene2_e.png b/apps/CameraITS/tests/scene2_e/scene2_e.png Binary files differindex b9554b33c9f..c64f47b61fa 100644 --- a/apps/CameraITS/tests/scene2_e/scene2_e.png +++ b/apps/CameraITS/tests/scene2_e/scene2_e.png diff --git a/apps/CameraITS/tests/scene2_e/scene2_e_0.5x_scaled.png b/apps/CameraITS/tests/scene2_e/scene2_e_0.5x_scaled.png Binary files differindex 92e3444ee20..7dbb41a44e4 100644 --- a/apps/CameraITS/tests/scene2_e/scene2_e_0.5x_scaled.png +++ b/apps/CameraITS/tests/scene2_e/scene2_e_0.5x_scaled.png diff --git a/apps/CameraITS/tests/scene2_e/scene2_e_0.67x_scaled.png b/apps/CameraITS/tests/scene2_e/scene2_e_0.67x_scaled.png Binary files differindex d8cca5c5b64..4ee532c19cb 100644 --- a/apps/CameraITS/tests/scene2_e/scene2_e_0.67x_scaled.png +++ b/apps/CameraITS/tests/scene2_e/scene2_e_0.67x_scaled.png diff --git a/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java b/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java index 93920a59365..9487122630f 100644 --- a/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java +++ b/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java @@ -51,6 +51,7 @@ import com.android.compatibility.common.util.CddTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -214,6 +215,7 @@ public class NearbyDevicesPermissionTest { * scan results; they'd always need to involve the user to gain permissions. */ @Test + @Ignore public void testRequestBluetoothPermission_Upgrade() throws Throwable { install(APK_BLUETOOTH_30); grantPermission(TEST_APP_PKG, ACCESS_FINE_LOCATION); |
