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

Commit 8bdea9da authored Mar 24, 2023 by Vinit Nayak Committed by Automerger Merge Worker Mar 24, 2023

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

Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b am: cbc884e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827

Change-Id: Ic751581c09fd82949f78e8cd58baaaf2424ff124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 7de5e99a cbc884e1

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.
		}