Merge "android:ui crash on longpress of empty tile" into pi-dev

am: 7a8aac8c6e Change-Id: I49deb50169e0245025caceb5bdf65f515f45ce8f
2018-04-02 21:45:31 -07:00
parent 64209d7b1a 7a8aac8c6e
commit 0752251324
1 changed files with 4 additions and 0 deletions
--- 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 =