diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-09 17:02:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-09 17:02:15 +0000 |
commit | 01f8fb91326aba7c4c5a7193a825528dd910393f (patch) | |
tree | b9bebb8c12a074607674b290e13674baafe240dd | |
parent | f083b7741a1f1e262817ce8112edfd14a269b5e5 (diff) | |
parent | 2bad570b40506bab04650711db3a3155043554c8 (diff) | |
download | android_packages_apps_Trebuchet-01f8fb91326aba7c4c5a7193a825528dd910393f.tar.gz android_packages_apps_Trebuchet-01f8fb91326aba7c4c5a7193a825528dd910393f.tar.bz2 android_packages_apps_Trebuchet-01f8fb91326aba7c4c5a7193a825528dd910393f.zip |
Merge "Support for getting Launcher Pss by tests" into ub-launcher3-qt-qpr1-dev
3 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java index 4fd0f884d..243ff6f96 100644 --- a/src/com/android/launcher3/testing/TestInformationHandler.java +++ b/src/com/android/launcher3/testing/TestInformationHandler.java @@ -17,6 +17,7 @@ package com.android.launcher3.testing; import android.content.Context; import android.os.Bundle; +import android.os.Debug; import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; @@ -113,13 +114,13 @@ public class TestInformationHandler implements ResourceBasedOverride { break; } - case TestProtocol.REQUEST_ALLOCATED_MEMORY: { - final Runtime runtime = Runtime.getRuntime(); - response.putLong(TestProtocol.TEST_INFO_RESPONSE_FIELD, - runtime.totalMemory() - runtime.freeMemory()); + case TestProtocol.REQUEST_TOTAL_PSS_KB: { + Debug.MemoryInfo mem = new Debug.MemoryInfo(); + Debug.getMemoryInfo(mem); + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, mem.getTotalPss()); break; } } return response; } -} +}
\ No newline at end of file diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index d569d4007..60a59ddfa 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -73,7 +73,7 @@ public final class TestProtocol { public static final String REQUEST_APP_LIST_FREEZE_FLAGS = "app-list-freeze-flags"; public static final String REQUEST_OVERVIEW_LEFT_GESTURE_MARGIN = "overview-left-margin"; public static final String REQUEST_OVERVIEW_RIGHT_GESTURE_MARGIN = "overview-right-margin"; - public static final String REQUEST_ALLOCATED_MEMORY = "allocated-memory"; + public static final String REQUEST_TOTAL_PSS_KB = "total_pss"; public static boolean sDebugTracing = false; public static final String REQUEST_ENABLE_DEBUG_TRACING = "enable-debug-tracing"; diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 0bd63623d..14f2c857e 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -957,8 +957,8 @@ public final class LauncherInstrumentation { getTestInfo(TestProtocol.REQUEST_DISABLE_DEBUG_TRACING); } - public long getAllocatedMemory() { - return getTestInfo(TestProtocol.REQUEST_ALLOCATED_MEMORY). - getLong(TestProtocol.TEST_INFO_RESPONSE_FIELD); + public int getTotalPssKb() { + return getTestInfo(TestProtocol.REQUEST_TOTAL_PSS_KB). + getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD); } }
\ No newline at end of file |