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

Commit 86926638 authored by Pinyao Ting's avatar Pinyao Ting
Browse files

Fix the issue widget retore doesn't play well with work profile 

This CL addresses a logic flaw which leads to widgets from packages
pending restore being remvoed after work profile restore has started.

Bug: 229174907
Test: manual
Change-Id: I77bcc611560f0c2813f911bf234fe6afb8ae5b2f
parent b45b8bdc

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+15 −4
Original line number Diff line number Diff line
@@ -4414,7 +4414,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        // a given package.  Keep track of what we've done so far here; the list is

        // cleared at the start of every system restore pass, but preserved through

        // any install-time restore operations.

        private final HashSet<String> mPrunedApps = new HashSet<>();

        private final SparseArray<Set<String>> mPrunedAppsPerUser = new SparseArray<>();



        private final HashMap<Provider, ArrayList<RestoreUpdateRecord>> mUpdatesByProvider =

                new HashMap<>();
@@ -4537,7 +4537,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                // We're starting a new "system" restore operation, so any widget restore

                // state that we see from here on is intended to replace the current

                // widget configuration of any/all of the affected apps.

                mPrunedApps.clear();

                getPrunedAppsLocked(userId).clear();

                mUpdatesByProvider.clear();

                mUpdatesByHost.clear();

            }
@@ -4934,8 +4934,10 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        // instances that are hosted by that app, and (b) all instances in other hosts

        // for which 'pkg' is the provider.  We assume that we'll be restoring all of

        // these hosts & providers, so will be reconstructing a correct live state.

        @GuardedBy("mLock")

        private void pruneWidgetStateLocked(String pkg, int userId) {

            if (!mPrunedApps.contains(pkg)) {

            final Set<String> prunedApps = getPrunedAppsLocked(userId);

            if (!prunedApps.contains(pkg)) {

                if (DEBUG) {

                    Slog.i(TAG, "pruning widget state for restoring package " + pkg);

                }
@@ -4958,7 +4960,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                        removeWidgetLocked(widget);

                    }

                }

                mPrunedApps.add(pkg);

                prunedApps.add(pkg);

            } else {

                if (DEBUG) {

                    Slog.i(TAG, "already pruned " + pkg + ", continuing normally");
@@ -4966,6 +4968,15 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            }

        }



        @GuardedBy("mLock")

        @NonNull

        private Set<String> getPrunedAppsLocked(int userId) {

            if (!mPrunedAppsPerUser.contains(userId)) {

                mPrunedAppsPerUser.set(userId, new ArraySet<>());

            }

            return mPrunedAppsPerUser.get(userId);

        }



        private boolean isProviderAndHostInUser(Widget widget, int userId) {

            // Backup only widgets hosted or provided by the owner profile.

            return widget.host.getUserId() == userId && (widget.provider == null