Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc88784f authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Revert "Band-aid for getHomeActivities returning null"" into sc-v2-dev

parents f0b8ef9d 5cca2265

quickstep/src/com/android/quickstep/OverviewComponentObserver.java

+0 −13
Original line number Diff line number Diff line
@@ -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);

src/com/android/launcher3/testing/TestProtocol.java

+0 −1
Original line number Diff line number Diff line
@@ -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";

}