diff options
| author | Sanry Huang <sanryhuang@google.com> | 2018-04-03 02:22:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-03 02:22:48 +0000 |
| commit | 7a8aac8c6e68f3177d7f38e28862647c61b19c86 (patch) | |
| tree | f1ca56535c4ab3af68121a79237851ff2070ebf3 /core/java | |
| parent | 41d6d7c42436baae1a9084c237350e21c22f57f1 (diff) | |
| parent | 296ca9e933a7b1030c8e0f0cef7bb3dbc8070249 (diff) | |
Merge "android:ui crash on longpress of empty tile" into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 6e0ba3413e8c..97043c72dc5d 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -389,6 +389,10 @@ public class ChooserActivity extends ResolverActivity { @Override public void showTargetDetails(ResolveInfo ri) { + if (ri == null) { + return; + } + ComponentName name = ri.activityInfo.getComponentName(); boolean pinned = mPinnedSharedPrefs.getBoolean(name.flattenToString(), false); ResolverTargetActionsDialogFragment f = |