commit 923614520d68f75fd2134edec84c39f9c54c6aef
author Brian Muramatsu <btmura@google.com> Fri May 11 13:05:05 2012 -0700
committer Brian Muramatsu <btmura@google.com> Fri May 11 13:05:05 2012 -0700
tree 01bb7f5c64441f68b50894cb6037e2ca0e8c2029
parent 7d825760e3936893f23e6d5dacb5dfbce525dc12

Disable Keyguard in OpenGL Tests

Bug 6300479

This should fix the flakiness for
AttachShaderTest#test_glAttachedShaders_attach_same_shader.

Change-Id: I414ca3175f7fea0a641dd6b79851dc92faadd310

tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java

diff --git a/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java b/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java
index 809b640..a3b7503 100644
--- a/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java
+++ b/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java
@@ -20,6 +20,8 @@
 import android.opengl.GLSurfaceView;
 import android.opengl.GLSurfaceView.Renderer;
 import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
 
 public class OpenGLES20ActivityOne extends Activity {
     OpenGLES20View view;
@@ -29,7 +31,8 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        Window window = getWindow();
+        window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
     }
 
     public void setView(int type, int i ) {
@@ -48,7 +51,9 @@
     @Override
     protected void onPause() {
         super.onPause();
-        view.onPause();
+        if (view != null) {
+            view.onPause();
+        }
     }
 
     @Override

tests/tests/opengl/src/android/opengl/cts/OpenGLES20NativeActivity.java

diff --git a/tests/tests/opengl/src/android/opengl/cts/OpenGLES20NativeActivity.java b/tests/tests/opengl/src/android/opengl/cts/OpenGLES20NativeActivity.java
index d642e7a..7028db2 100755
--- a/tests/tests/opengl/src/android/opengl/cts/OpenGLES20NativeActivity.java
+++ b/tests/tests/opengl/src/android/opengl/cts/OpenGLES20NativeActivity.java
@@ -23,11 +23,12 @@
 import android.app.Activity;
 import android.content.Context;
 import android.opengl.GLSurfaceView;
-
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -47,6 +48,8 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Window window = getWindow();
+        window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
     }
 
     public void setView(int type, int i ) {