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

Commit 4ed9562b authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev

parents 1a09d4a2 d3925b66

src/com/android/launcher3/LauncherModel.java

+4 −0
Original line number Diff line number Diff line
@@ -285,6 +285,10 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
                Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action) ||

                Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) {

            UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORK_TAB_MISSING, "onBroadcastIntent intentAction: " + action +

                        " user: " + user);

            }

            if (user != null) {

                if (Intent.ACTION_MANAGED_PROFILE_AVAILABLE.equals(action) ||

                        Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action)) {

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

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ public class WorkProfileTest extends AbstractLauncherUiTest { 
        }

        updateWorkProfileSetupSuccessful("am start-user", output);



        Log.d(WORK_TAB_MISSING, "workProfileSuccessful? " + mWorkProfileSetupSuccessful);

        Log.d(WORK_TAB_MISSING, "workProfileSuccessful? " + mWorkProfileSetupSuccessful +

                " shellCmd: " + logStr);

        if (!mWorkProfileSetupSuccessful) {

            return; // no need to setup launcher since all tests will skip.

        }