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

Commit 7f8d1be2 authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Use PROFILE_INACCESSIBLE to track locked profile" into udc-dev am: 5ed0d0ce 

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



Change-Id: Iff180fa693f54f295334b6cce63e1e26853e73dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7a75e5b 5ed0d0ce

src/com/android/launcher3/LauncherAppState.java

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public class LauncherAppState implements SafeCloseable { 
                Intent.ACTION_MANAGED_PROFILE_AVAILABLE,

                Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE,

                Intent.ACTION_MANAGED_PROFILE_UNLOCKED,

                Intent.ACTION_PROFILE_INACCESSIBLE,

                ACTION_DEVICE_POLICY_RESOURCE_UPDATED);

        if (FeatureFlags.IS_STUDIO_BUILD) {

            modelChangeReceiver.register(mContext, ACTION_FORCE_ROLOAD);

src/com/android/launcher3/LauncherModel.java

+7 −6
Original line number Diff line number Diff line
@@ -289,9 +289,10 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
        if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {

            // If we have changed locale we need to clear out the labels in all apps/workspace.

            forceReload();

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

                Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action) ||

                Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) {

        } else if (Intent.ACTION_MANAGED_PROFILE_AVAILABLE.equals(action)

                || Intent.ACTION_PROFILE_INACCESSIBLE.equals(action)

                || 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 +
@@ -304,10 +305,10 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
                            PackageUpdatedTask.OP_USER_AVAILABILITY_CHANGE, user));

                }



                // ACTION_MANAGED_PROFILE_UNAVAILABLE sends the profile back to locked mode, so

                // ACTION_PROFILE_INACCESSIBLE sends the profile back to locked mode, so

                // we need to run the state change task again.

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

                        Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) {

                if (Intent.ACTION_PROFILE_INACCESSIBLE.equals(action)

                        || Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) {

                    enqueueModelUpdateTask(new UserLockStateChangedTask(

                            user, Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)));

                }