am 63bc12a8: am 76808c29: CTS version up to 4.4_r0
* commit '63bc12a844a80e3eee3e3963a5711a9108c22154':
CTS version up to 4.4_r0
diff --git a/suite/audio_quality/lib/src/audio/AudioProtocol.cpp b/suite/audio_quality/lib/src/audio/AudioProtocol.cpp
index c3457f5..25c1422 100644
--- a/suite/audio_quality/lib/src/audio/AudioProtocol.cpp
+++ b/suite/audio_quality/lib/src/audio/AudioProtocol.cpp
@@ -18,8 +18,8 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <UniquePtr.h>
#include <utils/StrongPointer.h>
-#include <utils/UniquePtr.h>
#include "audio/Buffer.h"
#include "Log.h"
diff --git a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
index 445814e..6f1faf6 100644
--- a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
@@ -261,6 +261,7 @@
// Create a MediaCodec for the decoder, just based on the MIME type. The various
// format details will be passed through the csd-0 meta-data later on.
decoder = MediaCodec.createDecoderByType(MIME_TYPE);
+ if (VERBOSE) Log.d(TAG, "got decoder: " + decoder.getName());
doEncodeDecodeVideoFromBuffer(encoder, colorFormat, decoder, toSurface);
} finally {
@@ -321,7 +322,7 @@
// Create a MediaCodec for the decoder, just based on the MIME type. The various
// format details will be passed through the csd-0 meta-data later on.
decoder = MediaCodec.createDecoderByType(MIME_TYPE);
- MediaFormat decoderFormat = MediaFormat.createVideoFormat(MIME_TYPE, mWidth, mHeight);
+ if (VERBOSE) Log.d(TAG, "got decoder: " + decoder.getName());
decoder.configure(format, outputSurface.getSurface(), null, 0);
decoder.start();
@@ -910,7 +911,7 @@
// Set to zero. In YUV this is a dull green.
Arrays.fill(frameData, (byte) 0);
- int startX, startY, countX, countY;
+ int startX, startY;
frameIndex %= 8;
//frameIndex = (frameIndex / 8) % 8; // use this instead for debug -- easier to see
diff --git a/tests/tests/media/src/android/media/cts/InputSurface.java b/tests/tests/media/src/android/media/cts/InputSurface.java
index 5d72979..157ed88 100644
--- a/tests/tests/media/src/android/media/cts/InputSurface.java
+++ b/tests/tests/media/src/android/media/cts/InputSurface.java
@@ -35,7 +35,6 @@
*/
class InputSurface {
private static final String TAG = "InputSurface";
- private static final boolean VERBOSE = false;
private static final int EGL_RECORDABLE_ANDROID = 0x3142;
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index f047e28..8edf1d0 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -730,6 +730,13 @@
new File("/dev/alarm"), // b/9035217
new File("/dev/ashmem"),
new File("/dev/binder"),
+ new File("/dev/felica"),
+ new File("/dev/felica_ant"),
+ new File("/dev/felica_cen"),
+ new File("/dev/felica_pon"),
+ new File("/dev/felica_rfs"),
+ new File("/dev/felica_rws"),
+ new File("/dev/felica_uicc"),
new File("/dev/full"),
new File("/dev/genlock"), // b/9035217
new File("/dev/hw_random"), // b/9191279
@@ -749,6 +756,10 @@
new File("/dev/ptmx"), // b/9088251
new File("/dev/pvrsrvkm"), // b/9108170
new File("/dev/random"),
+ new File("/dev/snfc_cen"),
+ new File("/dev/snfc_hsel"),
+ new File("/dev/snfc_intu_poll"),
+ new File("/dev/snfc_rfs"),
new File("/dev/tiler"), // b/9108170
new File("/dev/tty"),
new File("/dev/urandom"),
diff --git a/tests/tests/security/src/android/security/cts/BannedFilesTest.java b/tests/tests/security/src/android/security/cts/BannedFilesTest.java
index f1db0cb..0b16380 100644
--- a/tests/tests/security/src/android/security/cts/BannedFilesTest.java
+++ b/tests/tests/security/src/android/security/cts/BannedFilesTest.java
@@ -85,6 +85,14 @@
assertNotSetugid("/vendor/bin/tcpdump-arm");
}
+ /**
+ * Test if /dev/diag exists.
+ */
+ public void testNoDevDiag(){
+ File file = new File("/dev/diag");
+ assertFalse("File \"" + file.getAbsolutePath() + "\" exists", file.exists());
+ }
+
private static void assertNotSetugid(String file) {
FileUtils.FileStatus fs = new FileUtils.FileStatus();
if (!FileUtils.getFileStatus(file, fs, false)) {
diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index 74d0f68..486d5f0 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -222,7 +222,7 @@
Set<Integer> retval = new HashSet<Integer>();
for (List<String> i : netlink) {
// The PID is in column 3
- int pid = Integer.decode(i.get(2));
+ int pid = Long.decode(i.get(2)).intValue();
if (new File("/proc/" + pid + "/cmdline").exists()) {
retval.add(pid);
}
diff --git a/tools/dasm/src/dasm/DAsm.java b/tools/dasm/src/dasm/DAsm.java
index d298689..72436ac 100644
--- a/tools/dasm/src/dasm/DAsm.java
+++ b/tools/dasm/src/dasm/DAsm.java
@@ -403,8 +403,11 @@
regs_count = 1;
method_nat = new CstNat(new CstString(name), new CstString(descriptor));
- if (method_nat.isClassInit()) access |= AccessFlags.ACC_STATIC;
- if (method_nat.isInstanceInit()) access |= AccessFlags.ACC_CONSTRUCTOR;
+ if (method_nat.isClassInit()) {
+ access |= (AccessFlags.ACC_CONSTRUCTOR | AccessFlags.ACC_STATIC);
+ } else if (method_nat.isInstanceInit()) {
+ access |= AccessFlags.ACC_CONSTRUCTOR;
+ }
method_acc = access;
}