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

Commit eaa3ee39 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Fix auto install add of installed activity" into ub-launcher3-master

parents d527716c a4c1002b

src/com/android/launcher3/model/PackageUpdatedTask.java

+7 −10
Original line number Diff line number Diff line
@@ -227,17 +227,14 @@ public class PackageUpdatedTask extends BaseModelUpdateTask { 
                                    isTargetValid = LauncherAppsCompat.getInstance(context)

                                            .isActivityEnabledForProfile(cn, mUser);

                                }



                                if (si.hasStatusFlag(ShortcutInfo.FLAG_AUTOINSTALL_ICON)) {

                                    // Auto install icon

                                    if (!isTargetValid) {

                                if (si.hasStatusFlag(ShortcutInfo.FLAG_AUTOINSTALL_ICON)

                                        && !isTargetValid) {

                                    if (updateShortcutIntent(context, si, packageName)) {

                                        infoUpdated = true;

                                    } else if (si.hasPromiseIconUi()) {

                                        removedShortcuts.put(si.id, true);

                                        continue;

                                    }

                                    }

                                } else if (!isTargetValid) {

                                    removedShortcuts.put(si.id, true);

                                    FileLog.e(TAG, "Restored shortcut no longer valid "