From 5cca2265b6ec71d2c6d701dec3005729bf005bc5 Mon Sep 17 00:00:00 2001 From: vadimt Date: Tue, 31 Aug 2021 18:01:50 -0700 Subject: [PATCH] Revert "Band-aid for getHomeActivities returning null" This reverts commit 42a7d1af83b317076afc16f5ff8e142c828bf613. REASON FOR REVERT: the underlying framework bug is fixed Test: presubmit Bug: 187080582 Change-Id: If580a35196ba9a9c5e3a5da642a2ea3aa3d9048e --- .../quickstep/OverviewComponentObserver.java | 13 ------------- src/com/android/launcher3/testing/TestProtocol.java | 1 - 2 files changed, 14 deletions(-) diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java index 780032e11b..0efe6666a8 100644 --- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java +++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java @@ -33,11 +33,8 @@ import android.content.IntentFilter; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.os.SystemClock; -import android.util.Log; import android.util.SparseIntArray; -import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.tracing.OverviewComponentObserverProto; import com.android.launcher3.tracing.TouchInteractionServiceProto; import com.android.launcher3.util.SimpleBroadcastReceiver; @@ -132,16 +129,6 @@ public final class OverviewComponentObserver { private void updateOverviewTargets() { ComponentName defaultHome = PackageManagerWrapper.getInstance() .getHomeActivities(new ArrayList<>()); - if (TestProtocol.sDebugTracing && defaultHome == null) { - Log.d(TestProtocol.THIRD_PARTY_LAUNCHER_NOT_SET, "getHomeActivities returned null"); - while ((defaultHome = - PackageManagerWrapper.getInstance().getHomeActivities(new ArrayList<>())) - == null) { - SystemClock.sleep(10); - } - Log.d(TestProtocol.THIRD_PARTY_LAUNCHER_NOT_SET, - "getHomeActivities returned non-null: " + defaultHome); - } mIsHomeDisabled = mDeviceState.isHomeDisabled(); mIsDefaultHome = Objects.equals(mMyHomeIntent.getComponent(), defaultHome); diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index c4848112ef..42a38b6271 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -117,7 +117,6 @@ public final class TestProtocol { public static final String PERMANENT_DIAG_TAG = "TaplTarget"; public static final String WORK_PROFILE_REMOVED = "b/159671700"; public static final String FALLBACK_ACTIVITY_NO_SET = "b/181019015"; - public static final String THIRD_PARTY_LAUNCHER_NOT_SET = "b/187080582"; public static final String TASK_VIEW_ID_CRASH = "b/195430732"; public static final String L3_SWIPE_TO_HOME = "b/192018189"; }