Merge "Skip emergency number check for SmsUsageMonitorShortCodeTest" into pie-cts-dev
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
index e8bdcc7..3904f09 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
@@ -545,7 +545,8 @@
mUntestedCombinations.remove(combination);
mTestedCombinations.add(combination);
- if (mUntestedCombinations.isEmpty()) {
+ if (mUntestedCombinations.isEmpty() &&
+ mUntestedCameras.isEmpty()) {
mPassButton.setEnabled(true);
if (VERBOSE) {
Log.v(TAG, "run: test success");
diff --git a/hostsidetests/sustainedperf/shadertoy_android/src/GLtestView.java b/hostsidetests/sustainedperf/shadertoy_android/src/GLtestView.java
index a6dab62..7893886 100644
--- a/hostsidetests/sustainedperf/shadertoy_android/src/GLtestView.java
+++ b/hostsidetests/sustainedperf/shadertoy_android/src/GLtestView.java
@@ -110,9 +110,9 @@
private static class ContextFactory implements GLSurfaceView.EGLContextFactory {
private static int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
- Log.w(TAG, "creating OpenGL ES 3.0 context");
+ Log.w(TAG, "creating OpenGL ES 2.0 context");
checkEglError("Before eglCreateContext", egl);
- int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL10.EGL_NONE };
+ int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
EGLContext context = egl.eglCreateContext(display, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
checkEglError("After eglCreateContext", egl);
return context;