From efe75cecadc9611a9659eb9de3053f6d9a71b679 Mon Sep 17 00:00:00 2001 From: vadimt Date: Wed, 24 May 2023 18:06:19 -0700 Subject: [PATCH] Removing memory object checks based on "dumpsys meminfo" This "dumpsys meminfo" can return phantom references that we have no control over and that can break all counting. Given that the removed code haven't found issues in the past, and that we have Launcher activity counting implemented via TestProtocol.REQUEST_GET_ACTIVITIES, removing all "dumpsys meminfo" code. Test: presubmit Bug: 260260325 Flag: N/A Change-Id: Ic80a6145d76d7cddfedad5328cb141a955b1eaf5 --- .../testing/DebugTestInformationHandler.java | 19 ------------------- .../testing/shared/TestProtocol.java | 3 --- .../tapl/LauncherInstrumentation.java | 8 -------- 3 files changed, 30 deletions(-) diff --git a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java index 3fddd9d693..dc28c6aabc 100644 --- a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java +++ b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java @@ -16,7 +16,6 @@ package com.android.launcher3.testing; -import static com.android.launcher3.testing.shared.TestProtocol.VIEW_AND_ACTIVITY_LEAKS; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -25,10 +24,7 @@ import android.app.Application; import android.content.Context; import android.os.Binder; import android.os.Bundle; -import android.os.Process; import android.system.Os; -import android.util.Log; -import android.view.View; import androidx.annotation.Keep; import androidx.annotation.Nullable; @@ -42,7 +38,6 @@ import com.android.launcher3.testing.shared.TestProtocol; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.Map; import java.util.WeakHashMap; import java.util.concurrent.CountDownLatch; @@ -52,7 +47,6 @@ import java.util.concurrent.TimeUnit; * Class to handle requests from tests, including debug ones. */ public class DebugTestInformationHandler extends TestInformationHandler { - private static LinkedList sLeaks; private static Collection sEvents; private static Application.ActivityLifecycleCallbacks sActivityLifecycleCallbacks; private static final Map sActivities = @@ -158,19 +152,6 @@ public class DebugTestInformationHandler extends TestInformationHandler { return response; } - case TestProtocol.REQUEST_VIEW_LEAK: { - if (sLeaks == null) sLeaks = new LinkedList(); - Log.d(VIEW_AND_ACTIVITY_LEAKS, "forcefully leaking 2 views"); - sLeaks.add(new View(mContext)); - sLeaks.add(new View(mContext)); - return response; - } - - case TestProtocol.PRINT_VIEW_LEAK: { - Log.d(VIEW_AND_ACTIVITY_LEAKS, "(pid=" + Process.myPid() + ") sLeaks=" + sLeaks); - return response; - } - case TestProtocol.REQUEST_START_EVENT_LOGGING: { sEvents = new ArrayList<>(); TestLogging.setEventConsumer( diff --git a/tests/shared/com/android/launcher3/testing/shared/TestProtocol.java b/tests/shared/com/android/launcher3/testing/shared/TestProtocol.java index bcad5defb2..76840fc33b 100644 --- a/tests/shared/com/android/launcher3/testing/shared/TestProtocol.java +++ b/tests/shared/com/android/launcher3/testing/shared/TestProtocol.java @@ -103,8 +103,6 @@ public final class TestProtocol { public static final String REQUEST_WINDOW_INSETS = "window-insets"; public static final String REQUEST_PID = "pid"; public static final String REQUEST_FORCE_GC = "gc"; - public static final String REQUEST_VIEW_LEAK = "view-leak"; - public static final String PRINT_VIEW_LEAK = "print-leak"; public static final String REQUEST_RECENT_TASKS_LIST = "recent-tasks-list"; public static final String REQUEST_START_EVENT_LOGGING = "start-event-logging"; public static final String REQUEST_GET_TEST_EVENTS = "get-test-events"; @@ -152,7 +150,6 @@ public final class TestProtocol { public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation"; public static final String PERMANENT_DIAG_TAG = "TaplTarget"; - public static final String VIEW_AND_ACTIVITY_LEAKS = "b/260260325"; public static final String WORK_TAB_MISSING = "b/243688989"; public static final String TWO_TASKBAR_LONG_CLICKS = "b/262282528"; diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 2adfc98e6d..c4f5da5418 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -1841,14 +1841,6 @@ public final class LauncherInstrumentation { return testInfo != null ? testInfo.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD) : null; } - public void produceViewLeak() { - getTestInfo(TestProtocol.REQUEST_VIEW_LEAK); - } - - public void printViewLeak() { - getTestInfo(TestProtocol.PRINT_VIEW_LEAK); - } - public ArrayList getRecentTasks() { ArrayList tasks = new ArrayList<>(); ArrayList components = getTestInfo(TestProtocol.REQUEST_RECENT_TASKS_LIST)