Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 969cdd33 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "Extend getPssPid to report itemized memtrack values" am: ca115f20 am:... 

Merge "Extend getPssPid to report itemized memtrack values" am: ca115f20 am: b641d098 am: 9530beb8 am: 1fd62ba7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8de8fd843b43c263b8267022907b4a6b5d447750
parents 9129c8df 1fd62ba7

core/java/android/os/Debug.java

+2 −1
Original line number Diff line number Diff line
@@ -1902,7 +1902,8 @@ public final class Debug 
     * Retrieves the PSS memory used by the process as given by the smaps. Optionally supply a long

     * array of up to 3 entries to also receive (up to 3 values in order): the Uss and SwapPss and

     * Rss (only filled in as of {@link android.os.Build.VERSION_CODES#P}) of the process, and

     * another array to also retrieve the separate memtrack size.

     * another array to also retrieve the separate memtrack sizes (up to 4 values in order): the

     * total memtrack reported size, memtrack graphics, memtrack gl and memtrack other.

     *

     * @return The PSS memory usage, or 0 if failed to retrieve (i.e., given pid has gone).

     * @hide

core/jni/android_os_Debug.cpp

+9 −0
Original line number Diff line number Diff line
@@ -540,6 +540,15 @@ static jlong android_os_Debug_getPssPid(JNIEnv *env, jobject clazz, jint pid, 
            jlong* outMemtrackArray = env->GetLongArrayElements(outMemtrack, 0);

            if (outMemtrackArray != NULL) {

                outMemtrackArray[0] = memtrack;

                if (env->GetArrayLength(outMemtrack) >= 2) {

                    outMemtrackArray[1] = graphics_mem.graphics;

                }

                if (env->GetArrayLength(outMemtrack) >= 3) {

                    outMemtrackArray[2] = graphics_mem.gl;

                }

                if (env->GetArrayLength(outMemtrack) >= 4) {

                    outMemtrackArray[3] = graphics_mem.other;

                }

            }

            env->ReleaseLongArrayElements(outMemtrack, outMemtrackArray, 0);

        }