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

Commit 7372fc65 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Using a different userManager class as getUserForSerialNumber gives a... 

Merge "Using a different userManager class as getUserForSerialNumber gives a valid userHandle for deleted user." into ub-launcher3-burnaby
parents 9fcedccf 7f834d2b

src/com/android/launcher3/LauncherModel.java

+14 −4
Original line number Diff line number Diff line
@@ -1866,6 +1866,11 @@ public class LauncherModel extends BroadcastReceiver 
                    final int optionsIndex = c.getColumnIndexOrThrow(

                            LauncherSettings.Favorites.OPTIONS);



                    final LongSparseArray<UserHandleCompat> allUsers = new LongSparseArray<>();

                    for (UserHandleCompat user : mUserManager.getUserProfiles()) {

                        allUsers.put(mUserManager.getSerialNumberForUser(user), user);

                    }



                    ShortcutInfo info;

                    String intentDescription;

                    LauncherAppWidgetInfo appWidgetInfo;
@@ -1887,7 +1892,7 @@ public class LauncherModel extends BroadcastReceiver 
                                id = c.getLong(idIndex);

                                intentDescription = c.getString(intentIndex);

                                serialNumber = c.getInt(profileIdIndex);

                                user = mUserManager.getUserForSerialNumber(serialNumber);

                                user = allUsers.get(serialNumber);

                                int promiseType = c.getInt(restoredIndex);

                                int disabledState = 0;

                                boolean itemReplaced = false;
@@ -2153,20 +2158,25 @@ public class LauncherModel extends BroadcastReceiver 
                                serialNumber = c.getLong(profileIdIndex);

                                String savedProvider = c.getString(appWidgetProviderIndex);

                                id = c.getLong(idIndex);

                                user = allUsers.get(serialNumber);

                                if (user == null) {

                                    itemsToRemove.add(id);

                                    continue;

                                }



                                final ComponentName component =

                                        ComponentName.unflattenFromString(savedProvider);



                                final int restoreStatus = c.getInt(restoredIndex);

                                final boolean isIdValid = (restoreStatus &

                                        LauncherAppWidgetInfo.FLAG_ID_NOT_VALID) == 0;



                                final boolean wasProviderReady = (restoreStatus &

                                        LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY) == 0;



                                final LauncherAppWidgetProviderInfo provider =

                                        LauncherModel.getProviderInfo(context,

                                                ComponentName.unflattenFromString(savedProvider),

                                                mUserManager.getUserForSerialNumber(serialNumber));

                                                user);



                                final boolean isProviderReady = isValidProvider(provider);

                                if (!isSafeMode && !customWidget &&