From 3b3fb665ab03e5db482dafbd96f78d65d948fc12 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Wed, 26 Jun 2019 17:52:26 -0700 Subject: [PATCH] Cleanup legacy recents package use Test: Build and flash Change-Id: I2f1eb1a712a36e6c0626b7f2422b59ddd3cd78c5 --- .../core/java/com/android/server/wm/ActivityRecord.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 01aeac888c18d..ba610557919f9 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -244,8 +244,6 @@ final class ActivityRecord extends ConfigurationContainer { private static final String TAG_SWITCH = TAG + POSTFIX_SWITCH; private static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY; private static final String TAG_FOCUS = TAG + POSTFIX_FOCUS; - // TODO(b/67864419): Remove once recents component is overridden - private static final String LEGACY_RECENTS_PACKAGE_NAME = "com.android.systemui.recents"; private static final boolean SHOW_ACTIVITY_START_TIME = true; @@ -1290,8 +1288,8 @@ final class ActivityRecord extends ConfigurationContainer { // We only allow home activities to be resizeable if they explicitly requested it. info.resizeMode = RESIZE_MODE_UNRESIZEABLE; } - } else if (mActivityComponent.getClassName().contains(LEGACY_RECENTS_PACKAGE_NAME) - || mAtmService.getRecentTasks().isRecentsComponent(mActivityComponent, appInfo.uid)) { + } else if (mAtmService.getRecentTasks().isRecentsComponent(mActivityComponent, + appInfo.uid)) { activityType = ACTIVITY_TYPE_RECENTS; } else if (options != null && options.getLaunchActivityType() == ACTIVITY_TYPE_ASSISTANT && canLaunchAssistActivity(launchedFromPackage)) {