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

Commit e7e7fc69 authored by Rubin Xu's avatar Rubin Xu Committed by Sunny Goyal
Browse files

Listen on new broadcasts for profile changes. 

The change is due to API review comments on the platform side.

Bug: 27532254
Change-Id: I44133fbb5c3ee13d0523a72b25d2e1c5d1eba6a0
parent 194cf506

src/com/android/launcher3/LauncherAppState.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,8 @@ public class LauncherAppState { 
        // For handling managed profiles

        // For handling managed profiles

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_AVAILABLE);

        filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_UNAVAILABLE);





        sContext.registerReceiver(mModel, filter);

        sContext.registerReceiver(mModel, filter);

        UserManagerCompat.getInstance(sContext).enableAndResetCache();

        UserManagerCompat.getInstance(sContext).enableAndResetCache();

src/com/android/launcher3/LauncherModel.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1277,7 +1277,8 @@ public class LauncherModel extends BroadcastReceiver 
                || LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) {

                || LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) {

            UserManagerCompat.getInstance(context).enableAndResetCache();

            UserManagerCompat.getInstance(context).enableAndResetCache();

            forceReload();

            forceReload();

        } else if (LauncherAppsCompat.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED.equals(action)) {

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

                LauncherAppsCompat.ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action)) {

            UserHandleCompat user = UserHandleCompat.fromIntent(intent);

            UserHandleCompat user = UserHandleCompat.fromIntent(intent);

            if (user != null) {

            if (user != null) {

                enqueuePackageUpdated(new PackageUpdatedTask(

                enqueuePackageUpdated(new PackageUpdatedTask(

src/com/android/launcher3/compat/LauncherAppsCompat.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -35,8 +35,10 @@ public abstract class LauncherAppsCompat { 
            "android.intent.action.MANAGED_PROFILE_ADDED";

            "android.intent.action.MANAGED_PROFILE_ADDED";

    public static final String ACTION_MANAGED_PROFILE_REMOVED =

    public static final String ACTION_MANAGED_PROFILE_REMOVED =

            "android.intent.action.MANAGED_PROFILE_REMOVED";

            "android.intent.action.MANAGED_PROFILE_REMOVED";

    public static final String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED =

    public static final String ACTION_MANAGED_PROFILE_AVAILABLE =

            "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";

            "android.intent.action.MANAGED_PROFILE_AVAILABLE";

    public static final String ACTION_MANAGED_PROFILE_UNAVAILABLE =

            "android.intent.action.MANAGED_PROFILE_UNAVAILABLE";





    public interface OnAppsChangedCallbackCompat {

    public interface OnAppsChangedCallbackCompat {

        void onPackageRemoved(String packageName, UserHandleCompat user);

        void onPackageRemoved(String packageName, UserHandleCompat user);