Merge "add more data integrity tests for NotificationListenerService." into jb-mr2-dev
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
index fdd5597..913ff4f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
@@ -120,9 +120,11 @@
@Override
public void onClick(View v) {
// Stop camera until preview sizes have been obtained.
- mCamera.stopPreview();
- mCamera.release();
- mCamera = null;
+ if (mCamera != null) {
+ mCamera.stopPreview();
+ mCamera.release();
+ mCamera = null;
+ }
mPreviewSizeCamerasToProcess.clear();
mPreviewSizes = new Size[Camera.getNumberOfCameras()];
diff --git a/tests/tests/openglperf/jni/OpenGlPerfNativeJni.cpp b/tests/tests/openglperf/jni/OpenGlPerfNativeJni.cpp
index 63311eb..a1cd16f 100644
--- a/tests/tests/openglperf/jni/OpenGlPerfNativeJni.cpp
+++ b/tests/tests/openglperf/jni/OpenGlPerfNativeJni.cpp
@@ -68,7 +68,7 @@
return JNI_FALSE;
}
jboolean res = JNI_TRUE;
- EGLint result = mEglClientWaitSyncKHR(dpy, sync, 0, waitTimeInNs);
+ EGLint result = mEglClientWaitSyncKHR(dpy, sync, EGL_SYNC_FLUSH_COMMANDS_BIT_KHR, waitTimeInNs);
if (result == EGL_FALSE) {
ALOGE("FrameCompletion: error waiting for fence: %#x", eglGetError());
res = JNI_FALSE;
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index 7b6a932..3abcbb6 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -686,6 +686,12 @@
getAllInsecureDevicesInDirAndSubdir(File dir) throws Exception {
assertTrue(dir.isDirectory());
Set<File> retval = new HashSet<File>();
+
+ if (isSymbolicLink(dir)) {
+ // don't examine symbolic links.
+ return retval;
+ }
+
File[] subDirectories = dir.listFiles(new FileFilter() {
@Override public boolean accept(File pathname) {
return pathname.isDirectory();
