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

Commit deaa3d08 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Allow for uninstalled apps in ShortcutManager" into nyc-dev 

am: a8242fa4

* commit 'a8242fa4':
  Allow for uninstalled apps in ShortcutManager
parents 22e01d56 a8242fa4

services/core/java/com/android/server/policy/ShortcutManager.java

+4 −2
Original line number Diff line number Diff line
@@ -138,14 +138,16 @@ class ShortcutManager { 
                    ComponentName componentName = new ComponentName(packageName, className);

                    try {

                        info = packageManager.getActivityInfo(componentName,

                                PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);

                                PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE

                                | PackageManager.MATCH_UNINSTALLED_PACKAGES);

                    } catch (PackageManager.NameNotFoundException e) {

                        String[] packages = packageManager.canonicalToCurrentPackageNames(

                                new String[] { packageName });

                        componentName = new ComponentName(packages[0], className);

                        try {

                            info = packageManager.getActivityInfo(componentName,

                                    PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);

                                    PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE

                                    | PackageManager.MATCH_UNINSTALLED_PACKAGES);

                        } catch (PackageManager.NameNotFoundException e1) {

                            Log.w(TAG, "Unable to add bookmark: " + packageName

                                    + "/" + className, e);