diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2015-03-25 09:48:36 -0700 |
|---|---|---|
| committer | Rajesh Yengisetty <rajesh@cyngn.com> | 2015-03-25 17:19:46 +0000 |
| commit | 42427c9b63936e82f9fbe934bddb376074a8e331 (patch) | |
| tree | d82c92ea0f139e4ccd0b0cf3b753c0958cda8cb7 /src/com/android/launcher3/HiddenFolderFragment.java | |
| parent | 04ad82dca0800bbd262a253eb4f32ffd3a5b57fb (diff) | |
| download | android_packages_apps_Trebuchet-42427c9b63936e82f9fbe934bddb376074a8e331.tar.gz android_packages_apps_Trebuchet-42427c9b63936e82f9fbe934bddb376074a8e331.tar.bz2 android_packages_apps_Trebuchet-42427c9b63936e82f9fbe934bddb376074a8e331.zip | |
ProtectedApps: Fix protecting shortcuts with no ComponentNames
Repro:
- Create a shortcut using the contacts widget
- Add to a folder and open app protection screen
- Observe: Trebuchet force closes
Change-Id: I76f6a8b1d024beb36fa804bb3a866913edc335c1
(cherry picked from commit d8bdb0eef3f1799e8b829bcf114f1c3573bce8d6)
Diffstat (limited to 'src/com/android/launcher3/HiddenFolderFragment.java')
| -rw-r--r-- | src/com/android/launcher3/HiddenFolderFragment.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher3/HiddenFolderFragment.java b/src/com/android/launcher3/HiddenFolderFragment.java index 94e1d2dbf..db5e51fb1 100644 --- a/src/com/android/launcher3/HiddenFolderFragment.java +++ b/src/com/android/launcher3/HiddenFolderFragment.java @@ -227,7 +227,10 @@ public class HiddenFolderFragment extends Fragment { viewHolder.title.setText(app.title); - Drawable icon = mIcons.get(app.componentName.getPackageName()); + Drawable icon = null; + if (app.componentName != null) { + icon = mIcons.get(app.componentName.getPackageName()); + } viewHolder.icon.setImageDrawable(icon != null ? icon : mDefaultImg); viewHolder.remove.setOnClickListener(new OnClickListener() { @Override @@ -284,8 +287,9 @@ public class HiddenFolderFragment extends Fragment { protected Void doInBackground(AppEntry... apps) { for (AppEntry app : apps) { try { - if (mIcons.containsKey(app.componentName - .getPackageName())) { + // Widget icons do not have a + if (app.componentName == null || + mIcons.containsKey(app.componentName.getPackageName())) { continue; } Drawable icon = mPackageManager |