From eff035d9964a927fe138baac8f70742bfc2ccd5f Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Thu, 27 Feb 2020 22:39:04 +0000 Subject: [PATCH] Do not go home when status bar collapse is requested. This is only invoked from CTS and related tests. Some of these tests attempt to launch an activity and then close the status bar in the setup step. This exits the activity and is not desired. Test: atest GtsIncidentManagerTestCases Test: atest CtsAutoFillServiceTestCases Bug: 150404191 Change-Id: Ic988c537dfbb72b6eac2dc3885bb832848f8df17 --- .../src/com/android/systemui/statusbar/tv/TvStatusBar.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java index 241d9783c6e0e..07985ab5a43c5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java @@ -74,11 +74,6 @@ public class TvStatusBar extends SystemUI implements CommandQueue.Callbacks { startSystemActivity(new Intent(ACTION_OPEN_TV_NOTIFICATIONS_PANEL)); } - @Override - public void animateCollapsePanels(int flags, boolean force) { - startSystemActivity(new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME)); - } - private void startSystemActivity(Intent intent) { PackageManager pm = mContext.getPackageManager(); ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_SYSTEM_ONLY);