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

Merge "Remove unnecessary calls to JNIEnv::GetArrayLength" am: da21df3a17 am: fffec9a0e0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7213469d10ff16139055498e7229c7019fa38d7c
This commit is contained in:
Treehugger Robot
2021-02-12 05:49:05 +00:00
committed by Automerger Merge Worker
parent 2bdb30ea8f fffec9a0e0
commit a317c76041
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/jni/android_os_Debug.cpp
View File

@@ -520,14 +520,15 @@ static jlong android_os_Debug_getPssPid(JNIEnv *env, jobject clazz, jint pid,
} }
if (outUssSwapPssRss != NULL) { if (outUssSwapPssRss != NULL) {
if (env->GetArrayLength(outUssSwapPssRss) >= 1) { int outLen = env->GetArrayLength(outUssSwapPssRss);
if (outLen >= 1) {
jlong* outUssSwapPssRssArray = env->GetLongArrayElements(outUssSwapPssRss, 0); jlong* outUssSwapPssRssArray = env->GetLongArrayElements(outUssSwapPssRss, 0);
if (outUssSwapPssRssArray != NULL) { if (outUssSwapPssRssArray != NULL) {
outUssSwapPssRssArray[0] = uss; outUssSwapPssRssArray[0] = uss;
if (env->GetArrayLength(outUssSwapPssRss) >= 2) { if (outLen >= 2) {
outUssSwapPssRssArray[1] = swapPss; outUssSwapPssRssArray[1] = swapPss;
} }
if (env->GetArrayLength(outUssSwapPssRss) >= 3) { if (outLen >= 3) {
outUssSwapPssRssArray[2] = rss; outUssSwapPssRssArray[2] = rss;
} }
} }
@@ -536,17 +537,18 @@ static jlong android_os_Debug_getPssPid(JNIEnv *env, jobject clazz, jint pid,
} }
if (outMemtrack != NULL) { if (outMemtrack != NULL) {
if (env->GetArrayLength(outMemtrack) >= 1) { int outLen = env->GetArrayLength(outMemtrack);
if (outLen >= 1) {
jlong* outMemtrackArray = env->GetLongArrayElements(outMemtrack, 0); jlong* outMemtrackArray = env->GetLongArrayElements(outMemtrack, 0);
if (outMemtrackArray != NULL) { if (outMemtrackArray != NULL) {
outMemtrackArray[0] = memtrack; outMemtrackArray[0] = memtrack;
if (env->GetArrayLength(outMemtrack) >= 2) { if (outLen >= 2) {
outMemtrackArray[1] = graphics_mem.graphics; outMemtrackArray[1] = graphics_mem.graphics;
} }
if (env->GetArrayLength(outMemtrack) >= 3) { if (outLen >= 3) {
outMemtrackArray[2] = graphics_mem.gl; outMemtrackArray[2] = graphics_mem.gl;
} }
if (env->GetArrayLength(outMemtrack) >= 4) { if (outLen >= 4) {
outMemtrackArray[3] = graphics_mem.other; outMemtrackArray[3] = graphics_mem.other;
} }
} }