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

Commit e806f953 authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Additional logs to resolve flaky work profile 

Bug: 159671700
Change-Id: I9bed08ef89b06f79ee1e6a4140a880eeeb76ee75
parent e5cbe2fc

src/com/android/launcher3/pm/UserCache.java

+5 −0
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ import android.content.Intent; 
import android.os.UserHandle;

import android.os.UserManager;

import android.util.ArrayMap;

import android.util.Log;

import android.util.LongSparseArray;



import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.launcher3.util.SafeCloseable;

import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -58,6 +60,9 @@ public class UserCache { 
    private void onUsersChanged(Intent intent) {

        enableAndResetCache();

        mUserChangeListeners.forEach(Runnable::run);

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "profile changed", new Exception());

        }

    }



    /**

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

+1 −0
Original line number Diff line number Diff line
@@ -106,4 +106,5 @@ public final class TestProtocol { 
    public static final String PAUSE_NOT_DETECTED = "b/139891609";

    public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";

    public static final String NO_SWIPE_TO_HOME = "b/158017601";

    public static final String WORK_PROFILE_REMOVED = "b/159671700";

}

tests/src/com/android/launcher3/ui/WorkTabTest.java

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; 
import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;

import android.widget.TextView;



import androidx.test.filters.LargeTest;
@@ -34,6 +35,7 @@ import com.android.launcher3.allapps.AllAppsContainerView; 
import com.android.launcher3.allapps.AllAppsPagedView;

import com.android.launcher3.allapps.WorkModeSwitch;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.views.WorkEduView;



import org.junit.After;
@@ -133,6 +135,10 @@ public class WorkTabTest extends AbstractLauncherUiTest { 
            workEduView.findViewById(R.id.proceed).callOnClick();

        });



        executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,

                "work profile status (" + mProfileUserId + ") :"

                        + launcher.getAppsView().isWorkTabVisible()));



        // verify work edu is seen next

        waitForLauncherCondition("Launcher did not show the next edu screen", l ->

                ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage() == WORK_PAGE