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

Commit 144b16bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9016e179 42a7d1af

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

+13 −0
Original line number Diff line number Diff line
@@ -33,8 +33,11 @@ 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;
@@ -129,6 +132,16 @@ 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);

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class FallbackRecentsTest { 
        mDevice = UiDevice.getInstance(instrumentation);

        mDevice.setOrientationNatural();

        mLauncher = new LauncherInstrumentation();

        mLauncher.enableDebugTracing();

        // b/143488140

        //mLauncher.enableCheckEventsForSuccessfulGestures();

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

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

}