Switch CTS to std::unique_ptr.
Bug: http://b/22403888
Change-Id: Ia5eca3b1574b2b87202b876533e01540434e1009
diff --git a/suite/audio_quality/executable/src/main.cpp b/suite/audio_quality/executable/src/main.cpp
index 66d90cc..0e969d1 100644
--- a/suite/audio_quality/executable/src/main.cpp
+++ b/suite/audio_quality/executable/src/main.cpp
@@ -18,7 +18,7 @@
#include <utils/String8.h>
-#include <UniquePtr.h>
+#include <memory>
#include "GenericFactory.h"
#include "Log.h"
@@ -90,7 +90,7 @@
return 1;
}
- UniquePtr<CleanupStatics> staticStuffs(new CleanupStatics());
+ std::unique_ptr<CleanupStatics> staticStuffs(new CleanupStatics());
if (Settings::Instance() == NULL) {
fprintf(stderr, "caanot create Settings");
return 1;
@@ -130,7 +130,7 @@
Settings::Instance()->addSetting(Settings::EDEVICE_INFO, deviceInfo);
ModelBuilder modelBuilder;
- UniquePtr<TaskGeneric> topTask(modelBuilder.parseTestDescriptionXml(xmlFile));
+ std::unique_ptr<TaskGeneric> topTask(modelBuilder.parseTestDescriptionXml(xmlFile));
if (topTask.get() == NULL) {
LOGE("Parsing of %x failed", xmlFile.string());
return 1;
diff --git a/suite/audio_quality/lib/include/task/TaskProcess.h b/suite/audio_quality/lib/include/task/TaskProcess.h
index 8afc677..724ebd7 100644
--- a/suite/audio_quality/lib/include/task/TaskProcess.h
+++ b/suite/audio_quality/lib/include/task/TaskProcess.h
@@ -18,9 +18,9 @@
#ifndef CTSAUDIO_TASKPROCESS_H
#define CTSAUDIO_TASKPROCESS_H
+#include <memory>
#include <vector>
-#include <UniquePtr.h>
#include <utils/StrongPointer.h>
#include "audio/Buffer.h"
@@ -42,15 +42,15 @@
bool parseParams(std::vector<Param>& list, const char* str, bool isInput);
//typedef necessary to prevent compiler's confusion
typedef void* void_ptr;
- typedef UniquePtr<TaskCase::Value> UniqueValue;
- typedef UniquePtr<android::sp<Buffer> > UniqueBuffer;
+ typedef std::unique_ptr<TaskCase::Value> UniqueValue;
+ typedef std::unique_ptr<android::sp<Buffer> > UniqueBuffer;
/// construct Buffers and Values for calling builtin functions.
- /// all constructed stuffs automatically deleted by the passed UniquePtrs
+ /// all constructed stuffs automatically deleted by the passed std::unique_ptrs.
bool prepareParams(std::vector<TaskProcess::Param>& list,
const bool* inputTypes,
- UniquePtr<void_ptr, DefaultDelete<void_ptr[]> > & ptrs,
- UniquePtr<UniqueValue, DefaultDelete<UniqueValue[]> > & values,
- UniquePtr<UniqueBuffer, DefaultDelete<UniqueBuffer[]> > & buffers,
+ std::unique_ptr<void_ptr[]>& ptrs,
+ std::unique_ptr<UniqueValue[]>& values,
+ std::unique_ptr<UniqueBuffer[]>& buffers,
bool isInput);
private:
@@ -86,7 +86,7 @@
std::vector<Param> mInput;
std::vector<Param> mOutput;
BuiltinProcessing mBuiltin;
- UniquePtr<SignalProcessingInterface> mSp;
+ std::unique_ptr<SignalProcessingInterface> mSp;
};
diff --git a/suite/audio_quality/lib/src/SignalProcessingImpl.h b/suite/audio_quality/lib/src/SignalProcessingImpl.h
index 29b410e..2b8b8e0 100644
--- a/suite/audio_quality/lib/src/SignalProcessingImpl.h
+++ b/suite/audio_quality/lib/src/SignalProcessingImpl.h
@@ -17,7 +17,7 @@
#ifndef CTSAUDIO_SIGNALPROCESSINGIMPL_H
#define CTSAUDIO_SIGNALPROCESSINGIMPL_H
-#include <UniquePtr.h>
+#include <memory>
#include <utils/String8.h>
#include "SignalProcessingInterface.h"
@@ -46,7 +46,7 @@
private:
static const int SCRIPT_PORT = 15010;
- UniquePtr<ClientSocket> mSocket;
+ std::unique_ptr<ClientSocket> mSocket;
pid_t mChildPid;
bool mChildRunning;
RWBuffer mBuffer;
diff --git a/suite/audio_quality/lib/src/audio/AudioProtocol.cpp b/suite/audio_quality/lib/src/audio/AudioProtocol.cpp
index 25c1422..26ce5c5 100644
--- a/suite/audio_quality/lib/src/audio/AudioProtocol.cpp
+++ b/suite/audio_quality/lib/src/audio/AudioProtocol.cpp
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <UniquePtr.h>
+#include <memory>
#include <utils/StrongPointer.h>
#include "audio/Buffer.h"
@@ -183,7 +183,7 @@
}
int len = ntohl(data[2]);
- UniquePtr<char, DefaultDelete<char[]> > infoString(new char[len + 1]);
+ std::unique_ptr<char[]> infoString(new char[len + 1]);
if (!readData(infoString.get(), len)) {
return false;
}
diff --git a/suite/audio_quality/lib/src/task/ModelBuilder.cpp b/suite/audio_quality/lib/src/task/ModelBuilder.cpp
index 6f34f5c..dc06ffc 100644
--- a/suite/audio_quality/lib/src/task/ModelBuilder.cpp
+++ b/suite/audio_quality/lib/src/task/ModelBuilder.cpp
@@ -16,7 +16,7 @@
#include <tinyxml.h>
-#include <UniquePtr.h>
+#include <memory>
#include "Log.h"
#include "GenericFactory.h"
@@ -103,7 +103,7 @@
{
TaskGeneric::TaskType typeSelf(mParsingTable[tableIndex].type);
int Nchildren = mParsingTable[tableIndex].Nchildren;
- UniquePtr<TaskGeneric> taskSelf(mFactory->createTask(typeSelf));
+ std::unique_ptr<TaskGeneric> taskSelf(mFactory->createTask(typeSelf));
if (taskSelf.get() == NULL) {
return NULL;
}
@@ -148,7 +148,7 @@
typeSelf);
return NULL;
}
- UniquePtr<TaskGeneric> taskChild(parseGeneric(*child, i));
+ std::unique_ptr<TaskGeneric> taskChild(parseGeneric(*child, i));
if (taskChild.get() == NULL) {
LOGE("ModelBuilder::parseGeneric failed in parsing child type %d for type %d",
childType, typeSelf);
@@ -184,7 +184,7 @@
TaskBatch* ModelBuilder::parseBatch(const TiXmlElement& root, const android::String8& xmlFileName)
{
- UniquePtr<TaskBatch> batch(
+ std::unique_ptr<TaskBatch> batch(
reinterpret_cast<TaskBatch*>(mFactory->createTask(TaskGeneric::ETaskBatch)));
if (batch.get() == NULL) {
LOGE("ModelBuilder::handleBatch cannot create TaskBatch");
@@ -201,7 +201,7 @@
}
android::String8 path = xmlFileName.getPathDir();
- UniquePtr<TaskCase> testCase;
+ std::unique_ptr<TaskCase> testCase;
int i = 0;
while (1) {
if (inc == NULL) {
diff --git a/suite/audio_quality/lib/src/task/TaskDownload.cpp b/suite/audio_quality/lib/src/task/TaskDownload.cpp
index dacefc5..2973f17 100644
--- a/suite/audio_quality/lib/src/task/TaskDownload.cpp
+++ b/suite/audio_quality/lib/src/task/TaskDownload.cpp
@@ -14,7 +14,6 @@
* the License.
*/
-#include <UniquePtr.h>
#include "Log.h"
#include "audio/AudioSignalFactory.h"
#include "audio/RemoteAudio.h"
diff --git a/suite/audio_quality/lib/src/task/TaskProcess.cpp b/suite/audio_quality/lib/src/task/TaskProcess.cpp
index 061dda5..816e920 100644
--- a/suite/audio_quality/lib/src/task/TaskProcess.cpp
+++ b/suite/audio_quality/lib/src/task/TaskProcess.cpp
@@ -16,6 +16,7 @@
#include <stdlib.h>
#include <string.h>
+#include <memory>
#include <vector>
#include "Log.h"
@@ -52,9 +53,9 @@
// Allocate Buffers and Values to pass to builtin functions
bool TaskProcess::prepareParams(std::vector<TaskProcess::Param>& list,
const bool* paramTypes,
- UniquePtr<void_ptr, DefaultDelete<void_ptr[]> > & ptrs,
- UniquePtr<UniqueValue, DefaultDelete<UniqueValue[]> > & values,
- UniquePtr<UniqueBuffer, DefaultDelete<UniqueBuffer[]> > & buffers,
+ std::unique_ptr<void_ptr[]>& ptrs,
+ std::unique_ptr<UniqueValue[]>& values,
+ std::unique_ptr<UniqueBuffer[]>& buffers,
bool isInput)
{
size_t N = list.size();
@@ -92,7 +93,7 @@
}
switch(list[i].getType()) {
case EId: {
- UniquePtr<android::sp<Buffer> > buffer(new android::sp<Buffer>());
+ std::unique_ptr<android::sp<Buffer> > buffer(new android::sp<Buffer>());
if (buffer.get() == NULL) {
LOGE("alloc failed");
return false;
@@ -166,17 +167,17 @@
}
}
// This is for passing to builtin fns. Just void pts will be cleared in exit
- UniquePtr<void_ptr, DefaultDelete<void_ptr[]> > inputs;
+ std::unique_ptr<void_ptr[]> inputs;
// This is for holding Value instances. Will be destroyed in exit
- UniquePtr<UniqueValue, DefaultDelete<UniqueValue[]> > inputValues;
+ std::unique_ptr<UniqueValue[]> inputValues;
// This is for holding android::sp<Buffer>. Buffer itself is from the global map.
- UniquePtr<UniqueBuffer, DefaultDelete<UniqueBuffer[]> > inputBuffers;
+ std::unique_ptr<UniqueBuffer[]> inputBuffers;
- UniquePtr<void_ptr, DefaultDelete<void_ptr[]> > outputs;
+ std::unique_ptr<void_ptr[]> outputs;
// Value is created here. Builtin function just need to set it.
- UniquePtr<UniqueValue, DefaultDelete<UniqueValue[]> > outputValues;
+ std::unique_ptr<UniqueValue[]> outputValues;
// Buffer itself should be allocated by the builtin function itself.
- UniquePtr<UniqueBuffer, DefaultDelete<UniqueBuffer[]> > outputBuffers;
+ std::unique_ptr<UniqueBuffer[]> outputBuffers;
if (!prepareParams(mInput, builtIn ? info->mInputTypes : NULL, inputs, inputValues,
inputBuffers, true)) {
@@ -192,11 +193,11 @@
if (builtIn) {
result = (mBuiltin.*(info->mFunction))(inputs.get(), outputs.get());
} else {
- UniquePtr<bool, DefaultDelete<bool[]> > inputTypes(new bool[mInput.size()]);
+ std::unique_ptr<bool[]> inputTypes(new bool[mInput.size()]);
for (size_t i = 0; i < mInput.size(); i++) {
(inputTypes.get())[i] = mInput[i].isIdType();
}
- UniquePtr<bool, DefaultDelete<bool[]> > outputTypes(new bool[mOutput.size()]);
+ std::unique_ptr<bool[]> outputTypes(new bool[mOutput.size()]);
for (size_t i = 0; i < mOutput.size(); i++) {
(outputTypes.get())[i] = mOutput[i].isIdType();
}
@@ -245,14 +246,15 @@
{
LOGV("TaskProcess::parseParams will parse %s", str);
android::String8 paramStr(str);
- UniquePtr<std::vector<android::String8> > paramTokens(StringUtil::split(paramStr, ','));
+ std::unique_ptr<std::vector<android::String8>> paramTokens(StringUtil::split(paramStr, ','));
if (paramTokens.get() == NULL) {
LOGE("split failed");
return false;
}
std::vector<android::String8>& tokens = *(paramTokens.get());
for (size_t i = 0; i < tokens.size(); i++) {
- UniquePtr<std::vector<android::String8> > itemTokens(StringUtil::split(tokens[i], ':'));
+ std::unique_ptr<std::vector<android::String8>> itemTokens(StringUtil::split(tokens[i],
+ ':'));
if (itemTokens.get() == NULL) {
LOGE("split failed");
return false;
@@ -294,7 +296,7 @@
bool TaskProcess::parseAttribute(const android::String8& name, const android::String8& value)
{
if (StringUtil::compare(name, "method") == 0) {
- UniquePtr<std::vector<android::String8> > tokenPtr(StringUtil::split(value, ':'));
+ std::unique_ptr<std::vector<android::String8> > tokenPtr(StringUtil::split(value, ':'));
std::vector<android::String8>* tokens = tokenPtr.get();
if (tokens == NULL) {
LOGE("split failed");
diff --git a/suite/audio_quality/lib/src/task/TaskSave.cpp b/suite/audio_quality/lib/src/task/TaskSave.cpp
index 156e554..18dfb5e 100644
--- a/suite/audio_quality/lib/src/task/TaskSave.cpp
+++ b/suite/audio_quality/lib/src/task/TaskSave.cpp
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <errno.h>
-#include <UniquePtr.h>
+#include <memory>
#include "Log.h"
#include "FileUtil.h"
@@ -51,7 +51,7 @@
return true; // true as there is no need to save
}
- UniquePtr<std::vector<android::String8> > list(StringUtil::split(fileValue, ','));
+ std::unique_ptr<std::vector<android::String8> > list(StringUtil::split(fileValue, ','));
std::vector<android::String8>* listp = list.get();
if (listp == NULL) {
LOGE("alloc failed");
@@ -75,7 +75,7 @@
}
for (size_t i = 0; i < listp->size(); i++) {
- UniquePtr<std::list<TaskCase::BufferPair> > buffers(
+ std::unique_ptr<std::list<TaskCase::BufferPair> > buffers(
getTestCase()->findAllBuffers((*listp)[i]));
std::list<TaskCase::BufferPair>* buffersp = buffers.get();
if (buffersp == NULL) {
@@ -104,7 +104,7 @@
return true; // true as there is no need to save
}
- UniquePtr<std::vector<android::String8> > list(StringUtil::split(reportValue, ','));
+ std::unique_ptr<std::vector<android::String8> > list(StringUtil::split(reportValue, ','));
std::vector<android::String8>* listp = list.get();
if (listp == NULL) {
LOGE("alloc failed");
@@ -113,7 +113,7 @@
MSG("=== Values stored ===");
android::String8 details;
for (size_t i = 0; i < listp->size(); i++) {
- UniquePtr<std::list<TaskCase::ValuePair> > values(
+ std::unique_ptr<std::list<TaskCase::ValuePair> > values(
getTestCase()->findAllValues((*listp)[i]));
std::list<TaskCase::ValuePair>* valuesp = values.get();
if (valuesp == NULL) {
diff --git a/suite/audio_quality/lib/src/task/TaskSound.cpp b/suite/audio_quality/lib/src/task/TaskSound.cpp
index 8dd9b4a..58b0364 100644
--- a/suite/audio_quality/lib/src/task/TaskSound.cpp
+++ b/suite/audio_quality/lib/src/task/TaskSound.cpp
@@ -14,7 +14,7 @@
* the License.
*/
-#include <UniquePtr.h>
+#include <memory>
#include "Log.h"
#include "audio/AudioSignalFactory.h"
#include "audio/RemoteAudio.h"
@@ -61,7 +61,7 @@
LOGE("TaskSound::run %s string not found", STR_TYPE.string());
return TaskGeneric::EResultError;
}
- UniquePtr<std::vector<android::String8> > tokens(StringUtil::split(type, ':'));
+ std::unique_ptr<std::vector<android::String8> > tokens(StringUtil::split(type, ':'));
if (tokens.get() == NULL) {
LOGE("alloc failed");
return TaskGeneric::EResultError;
diff --git a/suite/audio_quality/test/BufferTest.cpp b/suite/audio_quality/test/BufferTest.cpp
index 2c7b20e..5e315977 100644
--- a/suite/audio_quality/test/BufferTest.cpp
+++ b/suite/audio_quality/test/BufferTest.cpp
@@ -17,7 +17,7 @@
#include <stdint.h>
#include <gtest/gtest.h>
-#include <UniquePtr.h>
+#include <memory>
#include "audio/Buffer.h"
@@ -38,7 +38,7 @@
TEST_F(BufferTest, saveLoadStereoTest) {
const int BUFFER_SIZE = 32;
- UniquePtr<Buffer> buffer(new Buffer(BUFFER_SIZE, BUFFER_SIZE, true));
+ std::unique_ptr<Buffer> buffer(new Buffer(BUFFER_SIZE, BUFFER_SIZE, true));
ASSERT_TRUE(buffer.get() != NULL);
int16_t* data = (int16_t*)buffer->getData();
ASSERT_TRUE(data != NULL);
@@ -49,7 +49,7 @@
android::String8 file("/tmp/cts_audio_temp");
ASSERT_TRUE(buffer->saveToFile(file));
file.append(".r2s");
- UniquePtr<Buffer> bufferRead(Buffer::loadFromFile(file));
+ std::unique_ptr<Buffer> bufferRead(Buffer::loadFromFile(file));
ASSERT_TRUE(bufferRead.get() != NULL);
ASSERT_TRUE(bufferRead->getSize() == (size_t)BUFFER_SIZE);
ASSERT_TRUE(bufferRead->isStereo());
@@ -63,14 +63,14 @@
TEST_F(BufferTest, monoLTest) {
const int BUFFER_SIZE = 8;
- UniquePtr<Buffer> buffer(new Buffer(BUFFER_SIZE, BUFFER_SIZE, true));
+ std::unique_ptr<Buffer> buffer(new Buffer(BUFFER_SIZE, BUFFER_SIZE, true));
ASSERT_TRUE(buffer.get() != NULL);
int16_t* data = (int16_t*)buffer->getData();
ASSERT_TRUE(data != NULL);
for (int i = 0; i < BUFFER_SIZE/2; i++) {
data[i] = i;
}
- UniquePtr<Buffer> bufferl(new Buffer(BUFFER_SIZE/2, BUFFER_SIZE/2, false));
+ std::unique_ptr<Buffer> bufferl(new Buffer(BUFFER_SIZE/2, BUFFER_SIZE/2, false));
ASSERT_TRUE(bufferl.get() != NULL);
data = (int16_t*)bufferl->getData();
ASSERT_TRUE(data != NULL);
diff --git a/suite/audio_quality/test/FileUtilTest.cpp b/suite/audio_quality/test/FileUtilTest.cpp
index d79b2aa..990d7b9 100644
--- a/suite/audio_quality/test/FileUtilTest.cpp
+++ b/suite/audio_quality/test/FileUtilTest.cpp
@@ -17,8 +17,6 @@
#include <stdint.h>
#include <gtest/gtest.h>
-#include <UniquePtr.h>
-
#include "Log.h"
#include "FileUtil.h"
diff --git a/suite/audio_quality/test/LogTest.cpp b/suite/audio_quality/test/LogTest.cpp
index 421b904..4412338 100644
--- a/suite/audio_quality/test/LogTest.cpp
+++ b/suite/audio_quality/test/LogTest.cpp
@@ -17,8 +17,6 @@
#include <stdint.h>
#include <gtest/gtest.h>
-#include <UniquePtr.h>
-
#include "Log.h"
diff --git a/suite/audio_quality/test/MixerTest.cpp b/suite/audio_quality/test/MixerTest.cpp
index 96c23ed..413c3ce 100644
--- a/suite/audio_quality/test/MixerTest.cpp
+++ b/suite/audio_quality/test/MixerTest.cpp
@@ -16,7 +16,6 @@
#include <stdint.h>
#include <gtest/gtest.h>
-#include <UniquePtr.h>
#include <tinyalsa/asoundlib.h>
#include <Log.h>
#include <audio/AudioHardware.h>
diff --git a/tests/tests/security/jni/android_security_cts_SELinuxTest.cpp b/tests/tests/security/jni/android_security_cts_SELinuxTest.cpp
index 8f164bc..1cfde0a 100644
--- a/tests/tests/security/jni/android_security_cts_SELinuxTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_SELinuxTest.cpp
@@ -19,14 +19,15 @@
#include <JNIHelp.h>
#include <ScopedLocalRef.h>
#include <ScopedUtfChars.h>
-#include <UniquePtr.h>
+
+#include <memory>
struct SecurityContext_Delete {
void operator()(security_context_t p) const {
freecon(p);
}
};
-typedef UniquePtr<char[], SecurityContext_Delete> Unique_SecurityContext;
+typedef std::unique_ptr<char[], SecurityContext_Delete> Unique_SecurityContext;
/*
* Function: getFileContext