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

Merge "Revert "Remove empty ScopedArray constructor.""

Browse Source 
am: f6a0a7491b

Change-Id: I9c49b4209e98e90bea62ad1656f7405d771395c9
This commit is contained in:
Nicolas Geoffray
2017-12-09 13:38:43 +00:00
committed by android-build-merger
parent c044749416 f6a0a7491b
commit 73fce7397e
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/eventlog_helper.h
View File

@@ -155,6 +155,11 @@ 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);
@@ -182,7 +187,6 @@ 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]);
} }

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

@@ -41,11 +41,14 @@ 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");
ScopedNullableByteArrayRO buffer(env, jdata); ScopedByteArrayRO buffer{env};
if (buffer.size() != -1) { if (jdata != nullptr) {
buffer.reset(jdata);
LOG_ALWAYS_FATAL_IF(buffer.size() != sizeof(ProfileData), LOG_ALWAYS_FATAL_IF(buffer.size() != sizeof(ProfileData),
"Buffer size %zd doesn't match expected %zu!", buffer.size(), sizeof(ProfileData)); "Buffer size %zu 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);
@@ -58,8 +61,7 @@ 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, GraphicsStatsService::addToDump(dump, path, package, versionCode, startTime, endTime, data);
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) {
@@ -106,4 +108,4 @@ int register_android_server_GraphicsStatsService(JNIEnv* env)
sMethods, NELEM(sMethods)); sMethods, NELEM(sMethods));
} }
} // namespace android } // namespace android