Merge "Sharesheet - Fix NPE on default app launch" into qt-dev am: b5fbf20a55

am: aed9a62d7f Change-Id: I30499ca35f3f3d04d1696c50e9b7b0e8f153ec73
2019-05-29 10:11:29 -07:00
parent 009536d986 aed9a62d7f
commit 5dfeafbd0d
1 changed files with 5 additions and 3 deletions
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -383,9 +383,11 @@ public class ResolverActivity extends Activity {
                mSystemWindowInsets.right, 0);

        View emptyView = findViewById(R.id.empty);
-        emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom
-                + getResources().getDimensionPixelSize(
-                        R.dimen.chooser_edge_margin_normal) * 2);
+        if (emptyView != null) {
+            emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom
+                    + getResources().getDimensionPixelSize(
+                            R.dimen.chooser_edge_margin_normal) * 2);
+        }

        if (mFooterSpacer == null) {
            mFooterSpacer = new Space(getApplicationContext());