Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a8242fa442

* commit 'a8242fa442fabf4c19d35d961104fdde68ceaf0d':
  Allow for uninstalled apps in ShortcutManager
This commit is contained in:
Amith Yamasani
2016-03-04 01:04:40 +00:00
committed by android-build-merger
parent 22e01d5611 a8242fa442
commit deaa3d089d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/policy/ShortcutManager.java
View File

@@ -138,14 +138,16 @@ class ShortcutManager {
ComponentName componentName = new ComponentName(packageName, className); ComponentName componentName = new ComponentName(packageName, className);
try { try {
info = packageManager.getActivityInfo(componentName, info = packageManager.getActivityInfo(componentName,
PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE); PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE
| PackageManager.MATCH_UNINSTALLED_PACKAGES);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
String[] packages = packageManager.canonicalToCurrentPackageNames( String[] packages = packageManager.canonicalToCurrentPackageNames(
new String[] { packageName }); new String[] { packageName });
componentName = new ComponentName(packages[0], className); componentName = new ComponentName(packages[0], className);
try { try {
info = packageManager.getActivityInfo(componentName, info = packageManager.getActivityInfo(componentName,
PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE); PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE
| PackageManager.MATCH_UNINSTALLED_PACKAGES);
} catch (PackageManager.NameNotFoundException e1) { } catch (PackageManager.NameNotFoundException e1) {
Log.w(TAG, "Unable to add bookmark: " + packageName Log.w(TAG, "Unable to add bookmark: " + packageName
+ "/" + className, e); + "/" + className, e);