Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove empty ScopedArray constructor."

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-08 20:07:33 +00:00
committed by Gerrit Code Review
parent 12fc68681b cee368b2b8
commit e7120f5056
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/eventlog_helper.h
View File

@@ -155,11 +155,6 @@ public:
return; return;
} }
ScopedIntArrayRO tags(env);
if (jTags != nullptr) {
tags.reset(jTags);
}
while (1) { while (1) {
log_msg log_msg; log_msg log_msg;
int ret = android_logger_list_read(logger_list.get(), &log_msg); int ret = android_logger_list_read(logger_list.get(), &log_msg);
@@ -187,6 +182,7 @@ public:
if (jTags != nullptr) { if (jTags != nullptr) {
bool found = false; bool found = false;
ScopedIntArrayRO tags(env, jTags);
for (size_t i = 0; !found && i < tags.size(); ++i) { for (size_t i = 0; !found && i < tags.size(); ++i) {
found = (tag == tags[i]); found = (tag == tags[i]);
} }

12
services/core/jni/com_android_server_GraphicsStatsService.cpp
View File

@@ -41,14 +41,11 @@ static jlong createDump(JNIEnv*, jobject, jint fd, jboolean isProto) {
static void addToDump(JNIEnv* env, jobject, jlong dumpPtr, jstring jpath, jstring jpackage, static void addToDump(JNIEnv* env, jobject, jlong dumpPtr, jstring jpath, jstring jpackage,
jint versionCode, jlong startTime, jlong endTime, jbyteArray jdata) { jint versionCode, jlong startTime, jlong endTime, jbyteArray jdata) {
std::string path; std::string path;
const ProfileData* data = nullptr;
LOG_ALWAYS_FATAL_IF(jdata == nullptr && jpath == nullptr, "Path and data can't both be null"); LOG_ALWAYS_FATAL_IF(jdata == nullptr && jpath == nullptr, "Path and data can't both be null");
ScopedByteArrayRO buffer{env}; ScopedNullableByteArrayRO buffer(env, jdata);
if (jdata != nullptr) { if (buffer.size() != -1) {
buffer.reset(jdata);
LOG_ALWAYS_FATAL_IF(buffer.size() != sizeof(ProfileData), LOG_ALWAYS_FATAL_IF(buffer.size() != sizeof(ProfileData),
"Buffer size %zu doesn't match expected %zu!", buffer.size(), sizeof(ProfileData)); "Buffer size %zd doesn't match expected %zu!", buffer.size(), sizeof(ProfileData));
data = reinterpret_cast<const ProfileData*>(buffer.get());
} }
if (jpath != nullptr) { if (jpath != nullptr) {
ScopedUtfChars pathChars(env, jpath); ScopedUtfChars pathChars(env, jpath);
@@ -61,7 +58,8 @@ static void addToDump(JNIEnv* env, jobject, jlong dumpPtr, jstring jpath, jstrin
LOG_ALWAYS_FATAL_IF(!dump, "null passed for dump pointer"); LOG_ALWAYS_FATAL_IF(!dump, "null passed for dump pointer");
const std::string package(packageChars.c_str(), packageChars.size()); const std::string package(packageChars.c_str(), packageChars.size());
GraphicsStatsService::addToDump(dump, path, package, versionCode, startTime, endTime, data); GraphicsStatsService::addToDump(dump, path, package, versionCode, startTime, endTime,
reinterpret_cast<const ProfileData*>(buffer.get()));
} }
static void addFileToDump(JNIEnv* env, jobject, jlong dumpPtr, jstring jpath) { static void addFileToDump(JNIEnv* env, jobject, jlong dumpPtr, jstring jpath) {