diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2015-03-25 09:48:36 -0700 |
---|---|---|
committer | Stephen Bird <sbird@cyngn.com> | 2015-06-10 17:28:04 +0000 |
commit | 12302cb4ac405f2f88d12a93ea8687e4d2ae838c (patch) | |
tree | f53ffc1f0ad7c5c9a5ce176406e3972dec797a1b /src/com/android | |
parent | 641637f927e833cc2b50064d001aafd77de16508 (diff) | |
download | android_packages_apps_Trebuchet-12302cb4ac405f2f88d12a93ea8687e4d2ae838c.tar.gz android_packages_apps_Trebuchet-12302cb4ac405f2f88d12a93ea8687e4d2ae838c.tar.bz2 android_packages_apps_Trebuchet-12302cb4ac405f2f88d12a93ea8687e4d2ae838c.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)
(cherry picked from commit 42427c9b63936e82f9fbe934bddb376074a8e331)
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/HiddenFolderFragment.java | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 6c1296b34..ff8f347f5 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -297,7 +297,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList public void modifyProtectedApps(boolean protect) { ArrayList<ComponentName> components = new ArrayList<ComponentName>(); for (Pair<ComponentName, CharSequence> item : getComponents()) { - components.add(item.first); + if (item.first != null) { + components.add(item.first); + } } Intent intent = new Intent(); 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 |