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

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

Change-Id: I9517d17659a5e650d91037f9f687b81ca5f193d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak authored and Automerger Merge Worker committed 2023-03-24 18:55:40 +00:00
commit cbc884e191
2 files changed
+6 -1

No files matched your search

@@ -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)) {
@@ -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.
}